diff options
52 files changed, 2038 insertions, 4465 deletions
diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 --- a/ChangeLog +++ /dev/null diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index 2c7f685..1b18214 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #D3DAE3; background-color: rgba(56, 60, 74, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkFlowBox .grid-child { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkFlowBox .grid-child { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -259,9 +244,6 @@ GtkFlowBox .grid-child { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -673,9 +655,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #D3DAE3; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #a9caf1; } *:link:visited, .button:visited { @@ -693,9 +672,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -773,9 +749,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -799,9 +772,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -838,9 +808,6 @@ GtkComboBox { .action-bar { background-color: #313541; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1225,9 +1192,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); border-color: rgba(21, 23, 28, 0.67); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1242,9 +1206,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1317,9 +1278,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #383C4A; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1383,9 +1341,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { margin: 10px; padding: 2px; @@ -1418,10 +1373,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #404552; @@ -1554,9 +1505,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(211, 218, 227, 0.15); } -/************** - * Scrollbars * - **************/ .scrollbar { background-clip: padding-box; background-image: none; @@ -1601,9 +1549,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: transparent; background-color: #3e434f; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1664,9 +1609,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } @@ -1827,9 +1769,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(211, 218, 227, 0.45); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1909,9 +1848,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1948,16 +1884,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -1981,9 +1913,6 @@ GtkLevelBar.vertical { background-color: #404552; border-color: #404552; } -/********** - * Frames * - **********/ .frame { border: 1px solid #2b2e39; padding: 0; } @@ -2010,9 +1939,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #404552; border-color: #2b2e39; } @@ -2045,9 +1971,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2087,21 +2010,15 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ -GtkExpander { +.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - GtkExpander:dir(rtl) { + .expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - GtkExpander:hover { + .expander:hover { color: white; } - GtkExpander:checked { + .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #D3DAE3; border: 1px solid #2b2e39; @@ -2129,9 +2046,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2164,9 +2078,6 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #2b2e39; } -/*********** - * Sidebar * - ***********/ .sidebar { border: none; background-color: #383C4A; } @@ -2201,9 +2112,6 @@ GtkPaned { .pane-separator { background-image: linear-gradient(to bottom, #2b2e39); } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2245,9 +2153,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2262,9 +2167,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ GtkColorSwatch { border: none; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4); } @@ -2313,9 +2215,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2327,14 +2226,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } @@ -2613,86 +2587,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -3460,13 +3354,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3479,7 +3371,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3488,7 +3379,6 @@ GtkListBox .h4 { background-color: transparent; color: #D3DAE3; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #383C4A; @@ -3519,7 +3409,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3557,13 +3446,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3583,7 +3469,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3603,7 +3488,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3738,7 +3622,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #404552; } diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 292e58d..ea15e3d 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: rgba(245, 246, 247, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkFlowBox .grid-child { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkFlowBox .grid-child { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -258,9 +243,6 @@ GtkFlowBox .grid-child { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -672,9 +654,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -692,9 +671,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -772,9 +748,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -802,9 +775,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -841,9 +811,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1228,9 +1195,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); border-color: rgba(21, 23, 28, 0.67); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1245,9 +1209,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1320,9 +1281,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1386,9 +1344,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { margin: 10px; padding: 2px; @@ -1421,10 +1376,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1557,9 +1508,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { background-clip: padding-box; background-image: none; @@ -1604,9 +1552,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: transparent; background-color: #fcfcfc; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1667,9 +1612,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1830,9 +1772,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1912,9 +1851,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1951,16 +1887,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -1984,9 +1916,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2013,9 +1942,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #ffffff; border-color: #dcdfe3; } @@ -2048,9 +1974,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2090,21 +2013,15 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ -GtkExpander { +.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - GtkExpander:dir(rtl) { + .expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - GtkExpander:hover { + .expander:hover { color: #aaaeb7; } - GtkExpander:checked { + .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2132,9 +2049,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2167,9 +2081,6 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #dcdfe3; } -/*********** - * Sidebar * - ***********/ .sidebar { border: none; background-color: #F5F6F7; } @@ -2204,9 +2115,6 @@ GtkPaned { .pane-separator { background-image: linear-gradient(to bottom, #dcdfe3); } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2248,9 +2156,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2265,9 +2170,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ GtkColorSwatch { border: none; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4); } @@ -2316,9 +2218,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2330,14 +2229,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2616,86 +2590,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -3463,13 +3357,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3482,7 +3374,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3491,7 +3382,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3522,7 +3412,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3560,13 +3449,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3586,7 +3472,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3606,7 +3491,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3731,7 +3615,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 82cea77..60a023c 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #D3DAE3; background-color: #383C4A; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkFlowBox .grid-child { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkFlowBox .grid-child { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -259,9 +244,6 @@ GtkFlowBox .grid-child { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -673,9 +655,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #D3DAE3; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #a9caf1; } *:link:visited, .button:visited { @@ -693,9 +672,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -773,9 +749,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -799,9 +772,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -838,9 +808,6 @@ GtkComboBox { .action-bar { background-color: #313541; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1225,9 +1192,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #3e4553); border-color: rgba(21, 23, 28, 0.7); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1242,9 +1206,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1317,9 +1278,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #383C4A; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1383,9 +1341,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { margin: 10px; padding: 2px; @@ -1418,10 +1373,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #404552; @@ -1554,9 +1505,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(211, 218, 227, 0.15); } -/************** - * Scrollbars * - **************/ .scrollbar { background-clip: padding-box; background-image: none; @@ -1601,9 +1549,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: transparent; background-color: #3e434f; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1664,9 +1609,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } @@ -1827,9 +1769,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(211, 218, 227, 0.45); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1909,9 +1848,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1948,16 +1884,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -1981,9 +1913,6 @@ GtkLevelBar.vertical { background-color: #404552; border-color: #404552; } -/********** - * Frames * - **********/ .frame { border: 1px solid #2b2e39; padding: 0; } @@ -2010,9 +1939,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #404552; border-color: #2b2e39; } @@ -2045,9 +1971,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2087,21 +2010,15 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ -GtkExpander { +.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - GtkExpander:dir(rtl) { + .expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - GtkExpander:hover { + .expander:hover { color: white; } - GtkExpander:checked { + .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #D3DAE3; border: 1px solid #2b2e39; @@ -2129,9 +2046,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2164,9 +2078,6 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #2b2e39; } -/*********** - * Sidebar * - ***********/ .sidebar { border: none; background-color: #383C4A; } @@ -2201,9 +2112,6 @@ GtkPaned { .pane-separator { background-image: linear-gradient(to bottom, #2b2e39); } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2245,9 +2153,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2262,9 +2167,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ GtkColorSwatch { border: none; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4); } @@ -2313,9 +2215,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2327,14 +2226,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.35); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } @@ -2613,86 +2587,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -3460,13 +3354,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3479,7 +3371,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3488,7 +3379,6 @@ GtkListBox .h4 { background-color: transparent; color: #D3DAE3; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #383C4A; @@ -3519,7 +3409,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3557,13 +3446,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3583,7 +3469,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3603,7 +3488,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3738,7 +3622,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #404552; } diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index 27927ea..20bdf53 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: #F5F6F7; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkFlowBox .grid-child { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkFlowBox .grid-child { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -258,9 +243,6 @@ GtkFlowBox .grid-child { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -672,9 +654,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -692,9 +671,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -772,9 +748,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -802,9 +775,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -841,9 +811,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1228,9 +1195,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #3e4553); border-color: rgba(21, 23, 28, 0.7); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1245,9 +1209,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1320,9 +1281,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1386,9 +1344,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { margin: 10px; padding: 2px; @@ -1421,10 +1376,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1557,9 +1508,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { background-clip: padding-box; background-image: none; @@ -1604,9 +1552,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: transparent; background-color: #fcfcfc; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1667,9 +1612,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1830,9 +1772,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1912,9 +1851,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1951,16 +1887,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -1984,9 +1916,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2013,9 +1942,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #ffffff; border-color: #dcdfe3; } @@ -2048,9 +1974,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2090,21 +2013,15 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ -GtkExpander { +.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - GtkExpander:dir(rtl) { + .expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - GtkExpander:hover { + .expander:hover { color: #aaaeb7; } - GtkExpander:checked { + .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2132,9 +2049,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2167,9 +2081,6 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #dcdfe3; } -/*********** - * Sidebar * - ***********/ .sidebar { border: none; background-color: #F5F6F7; } @@ -2204,9 +2115,6 @@ GtkPaned { .pane-separator { background-image: linear-gradient(to bottom, #dcdfe3); } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2248,9 +2156,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2265,9 +2170,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ GtkColorSwatch { border: none; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4); } @@ -2316,9 +2218,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2330,14 +2229,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2616,86 +2590,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -3463,13 +3357,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3482,7 +3374,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3491,7 +3382,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3522,7 +3412,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3560,13 +3449,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3586,7 +3472,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3606,7 +3491,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3731,7 +3615,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index ea1a430..f47f9f4 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: #F5F6F7; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkFlowBox .grid-child { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkFlowBox .grid-child { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -258,9 +243,6 @@ GtkFlowBox .grid-child { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -672,9 +654,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -692,9 +671,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -772,9 +748,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -802,9 +775,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -841,9 +811,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1228,9 +1195,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #f5f5f7); border-color: rgba(82, 93, 118, 0.3); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1245,9 +1209,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1320,9 +1281,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1386,9 +1344,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { margin: 10px; padding: 2px; @@ -1421,10 +1376,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1557,9 +1508,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { background-clip: padding-box; background-image: none; @@ -1604,9 +1552,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: transparent; background-color: #fcfcfc; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1667,9 +1612,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1830,9 +1772,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1912,9 +1851,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1951,16 +1887,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -1984,9 +1916,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2013,9 +1942,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #ffffff; border-color: #dcdfe3; } @@ -2048,9 +1974,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2090,21 +2013,15 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ -GtkExpander { +.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - GtkExpander:dir(rtl) { + .expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - GtkExpander:hover { + .expander:hover { color: #aaaeb7; } - GtkExpander:checked { + .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2132,9 +2049,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2167,9 +2081,6 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #dcdfe3; } -/*********** - * Sidebar * - ***********/ .sidebar { border: none; background-color: #F5F6F7; } @@ -2204,9 +2115,6 @@ GtkPaned { .pane-separator { background-image: linear-gradient(to bottom, #dcdfe3); } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2248,9 +2156,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2265,9 +2170,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ GtkColorSwatch { border: none; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4); } @@ -2316,9 +2218,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2330,14 +2229,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2616,86 +2590,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -3463,13 +3357,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3482,7 +3374,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3491,7 +3382,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3522,7 +3412,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3560,13 +3449,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3586,7 +3472,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3606,7 +3491,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3731,7 +3615,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index 4266b45..78d18b0 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: rgba(245, 246, 247, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkFlowBox .grid-child { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkFlowBox .grid-child { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -258,9 +243,6 @@ GtkFlowBox .grid-child { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -672,9 +654,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -692,9 +671,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -772,9 +748,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -802,9 +775,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -841,9 +811,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1228,9 +1195,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(245, 246, 247, 0.985)); border-color: rgba(82, 93, 118, 0.3); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1245,9 +1209,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1320,9 +1281,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1386,9 +1344,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { margin: 10px; padding: 2px; @@ -1421,10 +1376,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1557,9 +1508,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { background-clip: padding-box; background-image: none; @@ -1604,9 +1552,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: transparent; background-color: #fcfcfc; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1667,9 +1612,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1830,9 +1772,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1912,9 +1851,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1951,16 +1887,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -1984,9 +1916,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2013,9 +1942,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #ffffff; border-color: #dcdfe3; } @@ -2048,9 +1974,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2090,21 +2013,15 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ -GtkExpander { +.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - GtkExpander:dir(rtl) { + .expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - GtkExpander:hover { + .expander:hover { color: #aaaeb7; } - GtkExpander:checked { + .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2132,9 +2049,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2167,9 +2081,6 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #dcdfe3; } -/*********** - * Sidebar * - ***********/ .sidebar { border: none; background-color: #F5F6F7; } @@ -2204,9 +2115,6 @@ GtkPaned { .pane-separator { background-image: linear-gradient(to bottom, #dcdfe3); } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2248,9 +2156,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2265,9 +2170,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ GtkColorSwatch { border: none; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4); } @@ -2316,9 +2218,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2330,14 +2229,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2616,86 +2590,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -3463,13 +3357,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3482,7 +3374,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3491,7 +3382,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3522,7 +3412,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3560,13 +3449,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3586,7 +3472,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3606,7 +3491,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3731,7 +3615,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index aaafff7..3356d3e 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -15,11 +15,6 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); -GtkCheckButton-indicator-size: 16; -GtkCheckMenuItem-indicator-size: 16; - // The size for scrollbars. The slider is 2px smaller, but we keep it - // up so that the whole area is sensitive to button presses for the - // slider. The stepper button is larger in both directions, the slider - // only in the width - -GtkScrolledWindow-scrollbar-spacing: 0; -GtkScrolledWindow-scrollbars-within-bevel: 1; @@ -47,9 +42,6 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); -GtkStatusbar-shadow-type: none; // We use the outline properties to signal the focus properties - // to the adwaita engine: using real CSS properties is faster, - // and we don't use any outlines for now. - outline-color: transparentize($fg_color, 0.7); outline-style: dashed; outline-offset: -3px; @@ -58,22 +50,14 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); } -/*************** - * Base States * - ***************/ - +// +// Base States +// .background { color: $fg_color; background-color: if($transparency == 'true', transparentize($bg_color, 0.001), $bg_color); // without this headerbar transparency doesn't seem to work } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ - *:insensitive { -gtk-image-effect: dim; } @@ -181,10 +165,9 @@ GtkFlowBox .grid-child { box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ - +// +// Spinner Animations +// @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -205,10 +188,9 @@ GtkFlowBox .grid-child { } } -/**************** - * Text Entries * - ****************/ - +// +// Text Entries +// .entry { border: 1px solid; padding: 5px 8px 6px; @@ -348,10 +330,9 @@ GtkFlowBox .grid-child { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ - +// +// Buttons +// // stuff for .needs-attention $_dot_color: $selected_bg_color; @@ -372,7 +353,6 @@ $_dot_color: $selected_bg_color; } } - .button { $_button_transition: all 200ms $ease-out-quad; @@ -385,7 +365,7 @@ $_dot_color: $selected_bg_color; @include button(normal); - &.flat { + &.flat { @include button(undecorated); background-color: transparentize($button_bg, 1); border-color: transparentize($button_border, 1); @@ -751,10 +731,9 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 &:checked { color: $fg_color; } } -/********* - * Links * - *********/ - +// +// Links +// *:link { color: $link_color; &:visited { @@ -782,10 +761,9 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 } } -/***************** - * GtkSpinButton * - *****************/ - +// +// Spinbuttons +// .spinbutton { border-radius: 3px; @@ -796,8 +774,7 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 color: mix($fg_color,$base_color,95%); border-radius: 0; box-shadow: none; - // padding-left: 6px; - // padding-right: 6px; + &:dir(rtl) { border-style: none solid none none; } &:first-child { color: red; } @@ -899,16 +876,18 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 } } -/************** - * ComboBoxes * - **************/ +// +// Comboboxes +// GtkComboBox { - > .button { padding-top: 3px; padding-bottom: 4px; } // Otherwise combos - // are bigger then - // buttons -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; + > .button { // Otherwise combos + padding-top: 3px; // are bigger than + padding-bottom: 4px; // buttons + } + &:insensitive { color: $insensitive_fg_color; } @@ -974,9 +953,9 @@ GtkComboBox { .linked.vertical > GtkComboBoxText:only-child > .button, .linked.vertical > GtkComboBox:only-child > .button { @extend %linked_vertical:only-child; } -/************ - * Toolbars * - ************/ +// +// Toolbars +// .toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -1026,10 +1005,9 @@ GtkComboBox { .action-bar { background-color: darken($bg_color, 3%) } -/*************** - * Header bars * - ***************/ - +// +// Headerbars +// .header-bar { padding: 7px 7px 6px 7px; @@ -1193,7 +1171,7 @@ GtkComboBox { } %header_widgets { - // Header-bar Entries + // Headerbar Entries .entry { @include entry(header-normal); @@ -1237,7 +1215,7 @@ GtkComboBox { } } - // Header-bar Buttons + // Headerbar Buttons .button { @include button(header-normal); @@ -1290,7 +1268,7 @@ GtkComboBox { } } - // Header-bar Suggested and Destructive Action buttons + // Headerbar Suggested and Destructive Action buttons @each $b_type, $b_color in (suggested-action, $suggested_color), (destructive-action, $destructive_color) { .button.#{$b_type} { @@ -1316,7 +1294,7 @@ GtkComboBox { } } - // Header-bar Spinbuttons + // Headerbar Spinbuttons & .spinbutton { &:focus .button { @@ -1334,7 +1312,7 @@ GtkComboBox { } } - // Header-bar ComboBoxes + // Headerbar ComboBoxes & GtkComboBox{ &:insensitive { color: transparentize($header_fg, 0.6); } @@ -1367,7 +1345,7 @@ GtkComboBox { } } - // Header-bar Switches + // Headerbar Switches GtkSwitch { &:backdrop { opacity: 0.75; } } @@ -1379,7 +1357,7 @@ GtkComboBox { &:backdrop { opacity: 0.75; } } - // Header-bar Scale + // Headerbar Scale .scale { &:backdrop { opacity: 0.75; } @@ -1413,9 +1391,9 @@ GtkComboBox { } } -/************ - * Pathbars * - ************/ +// +// Pathbars +// .path-bar .button { padding-left: 6px; padding-right: 6px; @@ -1431,9 +1409,9 @@ GtkComboBox { GtkLabel:only-child, GtkLabel { padding-right: 4px; padding-left: 4px; } } -/************** - * Tree Views * - **************/ +// +// Tree Views +// GtkTreeView.view { // treeview grid lines and expanders, unfortunatelly // the tree lines color can't be set -GtkTreeView-grid-line-width: 1; @@ -1545,9 +1523,9 @@ column-header.button.dnd { // for treeview-like derive widgets } } -/********* - * Menus * - *********/ +// +// Menus +// .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1625,10 +1603,9 @@ column-header.button.dnd { // for treeview-like derive widgets .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } -/************ - * Popovers * - ************/ - +// +// Popovers +// .popover { margin: 10px; padding: 2px; @@ -1663,17 +1640,10 @@ column-header.button.dnd { // for treeview-like derive widgets &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); } } -/***************** - * Notebooks and * - * Tabs * - *****************/ - +// +// Notebooks and Tabs +// .notebook { - // Through me you go to the grief wracked city; - // Through me you go to everlasting pain; - // Through me you go a pass among lost souls. - // ... - // Abandon all hope — Ye Who Enter Here padding: 0; background-color: $base_color; -GtkNotebook-initial-gap: 4; @@ -1687,15 +1657,13 @@ column-header.button.dnd { // for treeview-like derive widgets &.frame { border: 1px solid $borders_color; - // FIXME doesn't work + &.top { border-top-width: 0; } &.bottom { border-bottom-width: 0; } &.right { border-right-width: 0; } &.left { border-left-width: 0; } } &.header { - // FIXME: double borders in some case, can't fix it w/o a class tho - // FIXME: doesn't work on dark var background-color: $bg_color; // this is the shading of the header behind the tabs @@ -1708,18 +1676,10 @@ column-header.button.dnd { // for treeview-like derive widgets } $_header_border: $borders_color; - &.top { - box-shadow: inset 0 -1px $_header_border; // border - } - &.bottom { - box-shadow: inset 0 1px $_header_border; - } - &.right { - box-shadow: inset 1px 0 $_header_border; - } - &.left { - box-shadow: inset -1px 0 $_header_border; - } + &.top { box-shadow: inset 0 -1px $_header_border; } + &.bottom { box-shadow: inset 0 1px $_header_border; } + &.right { box-shadow: inset 1px 0 $_header_border; } + &.left { box-shadow: inset -1px 0 $_header_border; } } tab { border-width: 0; @@ -1840,10 +1800,9 @@ column-header.button.dnd { // for treeview-like derive widgets } } -/************** - * Scrollbars * - **************/ - +// +// Scrollbars +// $_scrollbar_bg_color: darken($base_color, 1%); .scrollbar { @@ -1908,9 +1867,9 @@ $_scrollbar_bg_color: darken($base_color, 1%); } -/********** - * Switch * - **********/ +// +// Switches +// GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1952,13 +1911,9 @@ GtkSwitch { } } -/************************* - * Check and Radio items * - *************************/ - -// draw regular check and radio items using our PNG assets -// all assets are rendered from assets.svg. never add pngs directly - +// +// Check and Radio items * +// @each $w,$a in ('check', 'checkbox'), ('radio','radio') { @@ -1992,7 +1947,7 @@ GtkSwitch { } } -//selection-mode +// Selectionmode @each $s,$as in ('','-selectionmode'), (':checked', '-checked-selectionmode') { GtkIconView.view.check#{$s}, @@ -2015,9 +1970,9 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } -/************ - * GtkScale * - ************/ +// +// GtkScale +// .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2124,15 +2079,13 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } -/***************** - * Progress bars * - *****************/ - +// +// Progress bars +// GtkProgressBar { padding: 0; font-size: smaller; color: transparentize($fg_color, 0.3); - //@include _shadows(_button_shadow(normal)); &.osd { -GtkProgressBar-xspacing: 0; @@ -2171,24 +2124,22 @@ GtkProgressBar.trough { border-style: none; background-color: transparent; box-shadow: none; - //FIXME: there is a margin on top } .list-row:selected &, GtkInfoBar & { background-color: transparentize(black, 0.8); } } -/************* - * Level Bar * - *************/ - +// +// Level Bar +// GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; -} -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; + &.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; + } } .level-bar { @@ -2224,9 +2175,9 @@ GtkLevelBar.vertical { } -/********** - * Frames * - **********/ +// +// Frames +// .frame { border: 1px solid $borders_color; &.flat { border-style: none; } @@ -2260,10 +2211,9 @@ GtkScrolledWindow { } } -/********* - * Lists * - *********/ - +// +// Lists +// .list, .list-row { background-color: $base_color; border-color: $borders_color; @@ -2308,10 +2258,9 @@ GtkScrolledWindow { &:hover { transition: none; } } -/********************* - * App Notifications * - *********************/ - +// +// App Notifications +// .app-notification, .app-notification.frame { padding: 10px; @@ -2337,20 +2286,19 @@ GtkScrolledWindow { } } -/************* - * Expanders * - *************/ - -GtkExpander { +// +// Expanders +// +.expander { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } &:hover { color: lighten($fg_color,30%); } //only lightens the arrow &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } } -/************ - * Calendar * - ***********/ +// +// Calendar +// GtkCalendar { color: $fg_color; border: 1px solid $borders_color; @@ -2383,9 +2331,9 @@ GtkCalendar { &.highlight { color: gtkalpha(currentColor,0.55); } } -/*********** - * Dialogs * - ***********/ +// +// Dialogs +// .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2439,9 +2387,9 @@ GtkFileChooserDialog { } } -/*********** - * Sidebar * - ***********/ +// +// Sidebar +// .sidebar { border: none; background-color: $bg_color; @@ -2484,6 +2432,9 @@ GtkPlacesSidebar.sidebar .view { } } +// +// Paned +// GtkPaned { // This is actually the invisible area of the paned separator, not a margin... margin: 0 8px 8px 0; //drag area of the separator @@ -2499,9 +2450,9 @@ GtkPaned { background-image: linear-gradient(to bottom, $borders_color); } -/************** - * GtkInfoBar * - **************/ +// +// GtkInfoBar +// GtkInfoBar { border-style: none; @@ -2557,9 +2508,9 @@ GtkInfoBar { } } -/************ - * Tooltips * - ************/ +// +// Tooltips +// .tooltip { &.background { // background-color needs to be set this way otherwise it gets drawn twice @@ -2582,9 +2533,9 @@ GtkInfoBar { color: inherit; // just to be sure } -/***************** - * Color Chooser * - *****************/ +// +// Color Chooser +// GtkColorSwatch { border: none; @@ -2656,9 +2607,9 @@ GtkColorButton.button { GtkColorSwatch { border-radius: 0; } } -/******** - * Misc * - ********/ +// +// Misc +// .scale-popup .button { // +/- buttons on GtkVolumeButton popup padding: 6px; &:hover { @@ -2668,23 +2619,49 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +// Decouple the font of context menus from their entry/textview +.touch-selection, +.context-menu { font: initial;} + +.monospace { font: Monospace; } + +// +// Overshoot +// +// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. +// This draws a box on top of the content, the size changes programmatically. +.overshoot { + &.top { @include overshoot(top); } + &.bottom { @include overshoot(bottom); } + &.left { @include overshoot(left); } + &.right { @include overshoot(right); } +} + +// +// Undershoot +// +// Overflow indication, works similarly to the overshoot, the size if fixed tho. +.undershoot { + &.top { @include undershoot(top); } + &.bottom { @include undershoot(bottom); } + &.left { @include undershoot(left); } + &.right { @include undershoot(right); } +} + +// +// Window Decorations +// .window-frame { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); - // lamefun trick to get rounded borders regardless of CSD use border-width: 0px; - // this needs to be transparent - // see bug #722563 $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.45)); box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), 0 8px 8px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); - /* this is used for the resize cursor area */ + // this is used for the resize cursor area margin: 10px; &:backdrop { @@ -2789,58 +2766,14 @@ GtkVolumeButton.button { padding: 8px; } .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child { padding: 4px 6px 4px 6px; - - @include button(undecorated); - - &:hover { - - } - &:active, &:checked { - - } - &:backdrop { } } -// catch all extend :) - +// catch all extend %selected_items { background-image: none; background-color: $selected_bg_color; color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); } - -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; -} - -.monospace { - font: Monospace; -} - -// -// Overshoot -// -// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. -// This draws a box on top of the content, the size changes programmatically. -.overshoot { - &.top { @include overshoot(top); } - &.bottom { @include overshoot(bottom); } - &.left { @include overshoot(left); } - &.right { @include overshoot(right); } -} - -// -// Undershoot -// -// Overflow indication, works similarly to the overshoot, the size if fixed tho. -.undershoot { - &.top { @include undershoot(top); } - &.bottom { @include undershoot(bottom); } - &.left { @include undershoot(left); } - &.right { @include undershoot(right); } -} diff --git a/common/gtk-3.0/3.14/sass/_lightdm.scss b/common/gtk-3.0/3.14/sass/_lightdm.scss index 0879a5a..89cdfcd 100644 --- a/common/gtk-3.0/3.14/sass/_lightdm.scss +++ b/common/gtk-3.0/3.14/sass/_lightdm.scss @@ -1,11 +1,11 @@ -/* the panel widget at the top */ +// the panel widget at the top #panel_window { background-color: $panel_bg; color: $panel_fg; font: bold; box-shadow: inset 0 -1px darken($panel_bg, 7%); - /* the menubars/menus of the panel, i.e. indicators */ + // the menubars/menus of the panel, i.e. indicators .menubar, .menubar > .menuitem { background-color: transparent; @@ -21,7 +21,7 @@ .menubar .menu .menuitem { font: normal; } } -/* the login window */ +// the login window #login_window, #shutdown_dialog, #restart_dialog { @@ -31,7 +31,7 @@ color: $fg_color; } -/* the top half of the login-window, in GtkDialog terms, the content */ +// the top half of the login-window, in GtkDialog terms, the content #content_frame { padding-bottom: 14px; background-color: $bg_color; @@ -49,7 +49,7 @@ &:insensitive { @include button(insensitive); } } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ +// the lower half of the login-window, in GtkDialog terms the buttonbox or action area #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -78,16 +78,16 @@ .arrow {} } -/* the user's avatar box */ +// the user's avatar box #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ +// the border around the user's avatar box #user_image_border {} -/* the shutdown button */ +// the shutdown button #shutdown_button.button { @include button(suggested_destructive, $destructive_color); @@ -95,7 +95,7 @@ &:active, &:checked { @include button(suggested_destructive, darken($destructive_color, 10%)); } } -/* the restart button */ +// the restart button #restart_button.button { @include button(suggested_destructive, $suggested_color); @@ -103,7 +103,7 @@ &:active, &:checked { @include button(suggested_destructive, darken($suggested_color, 10%)); } } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ +// the warning, in case a wrong password is entered or something else goes wrong according to PAM #greeter_infobar { border-bottom-width: 0; font: bold; diff --git a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss index 19025a0..90b4a2e 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -60,7 +60,7 @@ NautilusWindow .pane-separator, NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {background-color: $dark_sidebar_border} -/*Fix Nautilus transparency issues*/ +// Fix Nautilus transparency issues NautilusWindow NautilusWindowSlot { background-color: $base_color; } NautilusDesktopWindow NautilusWindowSlot { background-color: transparent; } diff --git a/common/gtk-3.0/3.14/sass/gtk-dark.scss b/common/gtk-3.0/3.14/sass/gtk-dark.scss index f47d7b5..529ee3d 100644 --- a/common/gtk-3.0/3.14/sass/gtk-dark.scss +++ b/common/gtk-3.0/3.14/sass/gtk-dark.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'dark'; $darker: 'false'; $transparency: 'true'; diff --git a/common/gtk-3.0/3.14/sass/gtk-darker.scss b/common/gtk-3.0/3.14/sass/gtk-darker.scss index 63166d2..34b8f81 100644 --- a/common/gtk-3.0/3.14/sass/gtk-darker.scss +++ b/common/gtk-3.0/3.14/sass/gtk-darker.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'true'; $transparency: 'true'; diff --git a/common/gtk-3.0/3.14/sass/gtk-solid-dark.scss b/common/gtk-3.0/3.14/sass/gtk-solid-dark.scss index 157292d..959d8b1 100644 --- a/common/gtk-3.0/3.14/sass/gtk-solid-dark.scss +++ b/common/gtk-3.0/3.14/sass/gtk-solid-dark.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'dark'; $darker: 'false'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.14/sass/gtk-solid-darker.scss b/common/gtk-3.0/3.14/sass/gtk-solid-darker.scss index 03ba34b..45b7dbe 100644 --- a/common/gtk-3.0/3.14/sass/gtk-solid-darker.scss +++ b/common/gtk-3.0/3.14/sass/gtk-solid-darker.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'true'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.14/sass/gtk-solid.scss b/common/gtk-3.0/3.14/sass/gtk-solid.scss index 347cf2c..28ff2b6 100644 --- a/common/gtk-3.0/3.14/sass/gtk-solid.scss +++ b/common/gtk-3.0/3.14/sass/gtk-solid.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'false'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.14/sass/gtk.scss b/common/gtk-3.0/3.14/sass/gtk.scss index c45d673..9bb0348 100644 --- a/common/gtk-3.0/3.14/sass/gtk.scss +++ b/common/gtk-3.0/3.14/sass/gtk.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'false'; $transparency: 'true'; diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index 6eeec70..5d982a6 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #D3DAE3; background-color: rgba(56, 60, 74, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -259,9 +244,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -673,9 +655,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #D3DAE3; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #a9caf1; } *:link:visited, .button:visited { @@ -693,9 +672,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -773,9 +749,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -799,9 +772,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -838,9 +808,6 @@ GtkComboBox { .action-bar { background-color: #313541; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1225,9 +1192,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); border-color: rgba(21, 23, 28, 0.67); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1242,9 +1206,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1326,9 +1287,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #383C4A; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1392,9 +1350,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #20222a; @@ -1426,10 +1381,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #404552; @@ -1562,9 +1513,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(211, 218, 227, 0.15); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1641,9 +1589,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1704,9 +1649,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } @@ -1867,9 +1809,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(211, 218, 227, 0.45); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1949,9 +1888,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1988,16 +1924,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2021,9 +1953,6 @@ GtkLevelBar.vertical { background-color: #404552; border-color: #404552; } -/********** - * Frames * - **********/ .frame { border: 1px solid #2b2e39; padding: 0; } @@ -2050,9 +1979,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #404552; border-color: #2b2e39; } @@ -2085,9 +2011,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2127,9 +2050,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2139,9 +2059,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #D3DAE3; border: 1px solid #2b2e39; @@ -2169,9 +2086,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2204,13 +2118,10 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #2b2e39; } -/*********** - * Sidebar * - ***********/ -.sidebar { +.sidebar, .sidebar .view { border: none; background-color: #383C4A; } - .sidebar:selected { + .sidebar:selected, .sidebar .view:selected { background-color: #5294E2; } GtkPlacesSidebar.sidebar .view { @@ -2249,9 +2160,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2293,9 +2201,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2310,9 +2215,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2380,9 +2282,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2394,14 +2293,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } @@ -2511,86 +2485,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2754,11 +2648,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #D3DAE3; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #8a909b; font-size: smaller; } @@ -3394,13 +3286,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3413,7 +3303,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3422,7 +3311,6 @@ GtkListBox .h4 { background-color: transparent; color: #D3DAE3; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #383C4A; @@ -3453,7 +3341,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3491,13 +3378,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3517,7 +3401,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3537,7 +3420,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3663,7 +3545,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #404552; } @@ -3868,7 +3749,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; @define-color theme_bg_color #383C4A; @@ -3894,6 +3774,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7,0.8); @define-color wm_unfocused_title alpha(#cfdae7,0.5); @define-color wm_bg #2f343f; @@ -3911,4 +3792,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #666A74; @define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #404552; diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index efe7f9c..24ee28a 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: rgba(245, 246, 247, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -258,9 +243,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -672,9 +654,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -692,9 +671,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -772,9 +748,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -802,9 +775,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -841,9 +811,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1228,9 +1195,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); border-color: rgba(21, 23, 28, 0.67); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1245,9 +1209,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1329,9 +1290,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1395,9 +1353,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #cdd2d7; @@ -1429,10 +1384,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1565,9 +1516,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1644,9 +1592,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1707,9 +1652,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1870,9 +1812,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1952,9 +1891,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1991,16 +1927,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2024,9 +1956,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2053,9 +1982,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #ffffff; border-color: #dcdfe3; } @@ -2088,9 +2014,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2130,9 +2053,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2142,9 +2062,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2172,9 +2089,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2207,13 +2121,10 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #dcdfe3; } -/*********** - * Sidebar * - ***********/ -.sidebar { +.sidebar, .sidebar .view { border: none; background-color: #F5F6F7; } - .sidebar:selected { + .sidebar:selected, .sidebar .view:selected { background-color: #5294E2; } GtkPlacesSidebar.sidebar .view { @@ -2252,9 +2163,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2296,9 +2204,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2313,9 +2218,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2383,9 +2285,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2397,14 +2296,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2514,86 +2488,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2757,11 +2651,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #5c616c; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #aeb0b6; font-size: smaller; } @@ -3397,13 +3289,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3416,7 +3306,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3425,7 +3314,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3456,7 +3344,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3494,13 +3381,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3520,7 +3404,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3540,7 +3423,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3656,7 +3538,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } @@ -3861,7 +3742,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; @define-color theme_bg_color #F5F6F7; @@ -3887,6 +3767,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7,0.8); @define-color wm_unfocused_title alpha(#cfdae7,0.5); @define-color wm_bg #2f343f; @@ -3904,4 +3785,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #666A74; @define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index 3626acf..8982a4d 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #D3DAE3; background-color: #383C4A; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -259,9 +244,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -673,9 +655,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #D3DAE3; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #a9caf1; } *:link:visited, .button:visited { @@ -693,9 +672,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -773,9 +749,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -799,9 +772,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -838,9 +808,6 @@ GtkComboBox { .action-bar { background-color: #313541; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1225,9 +1192,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #3e4553); border-color: rgba(21, 23, 28, 0.7); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1242,9 +1206,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1326,9 +1287,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #383C4A; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1392,9 +1350,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #20222a; @@ -1426,10 +1381,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #404552; @@ -1562,9 +1513,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(211, 218, 227, 0.15); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1641,9 +1589,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1704,9 +1649,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } @@ -1867,9 +1809,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(211, 218, 227, 0.45); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1949,9 +1888,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1988,16 +1924,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2021,9 +1953,6 @@ GtkLevelBar.vertical { background-color: #404552; border-color: #404552; } -/********** - * Frames * - **********/ .frame { border: 1px solid #2b2e39; padding: 0; } @@ -2050,9 +1979,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #404552; border-color: #2b2e39; } @@ -2085,9 +2011,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2127,9 +2050,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2139,9 +2059,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #D3DAE3; border: 1px solid #2b2e39; @@ -2169,9 +2086,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2204,13 +2118,10 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #2b2e39; } -/*********** - * Sidebar * - ***********/ -.sidebar { +.sidebar, .sidebar .view { border: none; background-color: #383C4A; } - .sidebar:selected { + .sidebar:selected, .sidebar .view:selected { background-color: #5294E2; } GtkPlacesSidebar.sidebar .view { @@ -2249,9 +2160,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2293,9 +2201,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2310,9 +2215,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2380,9 +2282,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2394,14 +2293,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.35); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } @@ -2511,86 +2485,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2754,11 +2648,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #D3DAE3; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #8a909b; font-size: smaller; } @@ -3394,13 +3286,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3413,7 +3303,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3422,7 +3311,6 @@ GtkListBox .h4 { background-color: transparent; color: #D3DAE3; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #383C4A; @@ -3453,7 +3341,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3491,13 +3378,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3517,7 +3401,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3537,7 +3420,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3663,7 +3545,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #404552; } @@ -3868,7 +3749,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; @define-color theme_bg_color #383C4A; @@ -3894,6 +3774,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7,0.8); @define-color wm_unfocused_title alpha(#cfdae7,0.5); @define-color wm_bg #2f343f; @@ -3911,4 +3792,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #666A74; @define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #404552; diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index d08962d..9f06c3d 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: #F5F6F7; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -258,9 +243,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -672,9 +654,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -692,9 +671,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -772,9 +748,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -802,9 +775,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -841,9 +811,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1228,9 +1195,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #3e4553); border-color: rgba(21, 23, 28, 0.7); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1245,9 +1209,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1329,9 +1290,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1395,9 +1353,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #cdd2d7; @@ -1429,10 +1384,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1565,9 +1516,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1644,9 +1592,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1707,9 +1652,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1870,9 +1812,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1952,9 +1891,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1991,16 +1927,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2024,9 +1956,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2053,9 +1982,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #ffffff; border-color: #dcdfe3; } @@ -2088,9 +2014,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2130,9 +2053,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2142,9 +2062,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2172,9 +2089,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2207,13 +2121,10 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #dcdfe3; } -/*********** - * Sidebar * - ***********/ -.sidebar { +.sidebar, .sidebar .view { border: none; background-color: #F5F6F7; } - .sidebar:selected { + .sidebar:selected, .sidebar .view:selected { background-color: #5294E2; } GtkPlacesSidebar.sidebar .view { @@ -2252,9 +2163,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2296,9 +2204,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2313,9 +2218,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2383,9 +2285,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2397,14 +2296,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2514,86 +2488,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2757,11 +2651,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #5c616c; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #aeb0b6; font-size: smaller; } @@ -3397,13 +3289,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3416,7 +3306,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3425,7 +3314,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3456,7 +3344,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3494,13 +3381,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3520,7 +3404,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3540,7 +3423,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3656,7 +3538,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } @@ -3861,7 +3742,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; @define-color theme_bg_color #F5F6F7; @@ -3887,6 +3767,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7,0.8); @define-color wm_unfocused_title alpha(#cfdae7,0.5); @define-color wm_bg #2f343f; @@ -3904,4 +3785,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #666A74; @define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index ec87ddd..6074163 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: #F5F6F7; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -258,9 +243,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -672,9 +654,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -692,9 +671,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -772,9 +748,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -802,9 +775,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -841,9 +811,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1228,9 +1195,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #f5f5f7); border-color: rgba(82, 93, 118, 0.3); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1245,9 +1209,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1329,9 +1290,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1395,9 +1353,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #cdd2d7; @@ -1429,10 +1384,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1565,9 +1516,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1644,9 +1592,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1707,9 +1652,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1870,9 +1812,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1952,9 +1891,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1991,16 +1927,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2024,9 +1956,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2053,9 +1982,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #ffffff; border-color: #dcdfe3; } @@ -2088,9 +2014,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2130,9 +2053,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2142,9 +2062,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2172,9 +2089,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2207,13 +2121,10 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #dcdfe3; } -/*********** - * Sidebar * - ***********/ -.sidebar { +.sidebar, .sidebar .view { border: none; background-color: #F5F6F7; } - .sidebar:selected { + .sidebar:selected, .sidebar .view:selected { background-color: #5294E2; } GtkPlacesSidebar.sidebar .view { @@ -2252,9 +2163,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2296,9 +2204,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2313,9 +2218,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2383,9 +2285,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2397,14 +2296,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2514,86 +2488,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2757,11 +2651,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #5c616c; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #aeb0b6; font-size: smaller; } @@ -3397,13 +3289,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3416,7 +3306,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3425,7 +3314,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3456,7 +3344,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3494,13 +3381,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3520,7 +3404,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3540,7 +3423,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3656,7 +3538,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } @@ -3861,7 +3742,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; @define-color theme_bg_color #F5F6F7; @@ -3887,6 +3767,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76,0.8); @define-color wm_unfocused_title alpha(#525d76,0.5); @define-color wm_bg #e7e8eb; @@ -3904,4 +3785,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #B6B8C0; @define-color wm_icon_hover_bg #7A7F8B; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index 152f470..dd7a899 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -28,19 +28,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: rgba(245, 246, 247, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -117,9 +108,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -135,9 +123,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -258,9 +243,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -672,9 +654,6 @@ GtkSearchEntry.entry { .menuitem.button.flat:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -692,9 +671,6 @@ GtkSearchEntry.entry { *:link:selected, .button:selected:link, .button:selected:visited, .header-bar.selection-mode .subtitle:link, .header-bar.titlebar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited { color: #dceaf9; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -772,9 +748,6 @@ GtkSearchEntry.entry { border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -802,9 +775,6 @@ GtkComboBox { GtkComboBox.combobox-entry .button:dir(rtl):insensitive { box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -841,9 +811,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1228,9 +1195,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(245, 246, 247, 0.985)); border-color: rgba(82, 93, 118, 0.3); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1245,9 +1209,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1329,9 +1290,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1395,9 +1353,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #cdd2d7; @@ -1429,10 +1384,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1565,9 +1516,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1644,9 +1592,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -1707,9 +1652,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1870,9 +1812,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -1952,9 +1891,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -1991,16 +1927,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2024,9 +1956,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2053,9 +1982,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list, .list-row { background-color: #ffffff; border-color: #dcdfe3; } @@ -2088,9 +2014,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.button:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2130,9 +2053,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2142,9 +2062,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2172,9 +2089,6 @@ GtkCalendar { GtkCalendar.highlight { color: alpha(currentColor,0.55); } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2207,13 +2121,10 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #dcdfe3; } -/*********** - * Sidebar * - ***********/ -.sidebar { +.sidebar, .sidebar .view { border: none; background-color: #F5F6F7; } - .sidebar:selected { + .sidebar:selected, .sidebar .view:selected { background-color: #5294E2; } GtkPlacesSidebar.sidebar .view { @@ -2252,9 +2163,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2296,9 +2204,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2313,9 +2218,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2383,9 +2285,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .scale-popup .button { padding: 6px; } .scale-popup .button:hover { @@ -2397,14 +2296,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2514,86 +2488,6 @@ GtkVolumeButton.button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2757,11 +2651,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #5c616c; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #aeb0b6; font-size: smaller; } @@ -3397,13 +3289,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3416,7 +3306,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3425,7 +3314,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3456,7 +3344,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3494,13 +3381,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3520,7 +3404,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3540,7 +3423,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3656,7 +3538,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } @@ -3861,7 +3742,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; @define-color theme_bg_color #F5F6F7; @@ -3887,6 +3767,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76,0.8); @define-color wm_unfocused_title alpha(#525d76,0.5); @define-color wm_bg #e7e8eb; @@ -3904,4 +3785,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #B6B8C0; @define-color wm_icon_hover_bg #7A7F8B; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index 2b3ecd7..36dbbef 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -200,12 +200,10 @@ NemoWindow { } } -/* Only normal state is handle */ .open-document-selector-name-label { color: $fg_color; } -/* Only normal state is handle */ .open-document-selector-path-label { color: mix($fg_color, $base_color, 50%); font-size: smaller; diff --git a/common/gtk-3.0/3.16/sass/_colors-public.scss b/common/gtk-3.0/3.16/sass/_colors-public.scss index 4203b0c..8807853 100644 --- a/common/gtk-3.0/3.16/sass/_colors-public.scss +++ b/common/gtk-3.0/3.16/sass/_colors-public.scss @@ -1,5 +1,4 @@ //apps rely on some named colors to be exported -/* GTK NAMED COLORS */ // Sass thinks we're using the colors in the variables as strings and may shoot // warning, it's innocuous and can be defeated by using "" + $var @@ -30,6 +29,8 @@ @define-color success_color #{"" + $success_color}; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #{"" + $base_color}; + //WM $wm_highlight: lighten(opacify($header_bg, 1), 3%); $wm_bg_unfocused: opacify($header_bg_backdrop, 1); @@ -63,8 +64,3 @@ $wm_bg_unfocused: opacify($header_bg_backdrop, 1); @define-color wm_icon_hover_bg #{"" + $wm_icon_hover_bg}; @define-color wm_icon_active_bg #{"" + $wm_icon_active_bg}; - -//FIXME this is really an API - -@define-color content_view_bg #{"" + $base_color}; - diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 059a9ae..fa89856 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -15,11 +15,6 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); -GtkCheckButton-indicator-size: 16; -GtkCheckMenuItem-indicator-size: 16; - // The size for scrollbars. The slider is 2px smaller, but we keep it - // up so that the whole area is sensitive to button presses for the - // slider. The stepper button is larger in both directions, the slider - // only in the width - -GtkScrolledWindow-scrollbar-spacing: 0; -GtkScrolledWindow-scrollbars-within-bevel: 1; @@ -47,9 +42,6 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); -GtkStatusbar-shadow-type: none; // We use the outline properties to signal the focus properties - // to the adwaita engine: using real CSS properties is faster, - // and we don't use any outlines for now. - outline-color: transparentize($fg_color, 0.7); outline-style: dashed; outline-offset: -3px; @@ -58,22 +50,14 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); } -/*************** - * Base States * - ***************/ - +// +// Base States +// .background { color: $fg_color; background-color: if($transparency == 'true', transparentize($bg_color, 0.001), $bg_color); // without this headerbar transparency doesn't seem to work } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ - *:insensitive { -gtk-image-effect: dim; } @@ -181,10 +165,9 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ - +// +// Spinner Animations +// @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -205,10 +188,9 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } } -/**************** - * Text Entries * - ****************/ - +// +// Text Entries +// .entry { border: 1px solid; padding: 5px 8px 6px; @@ -348,10 +330,9 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ - +// +// Buttons +// // stuff for .needs-attention $_dot_color: $selected_bg_color; @@ -372,7 +353,6 @@ $_dot_color: $selected_bg_color; } } - .button { $_button_transition: all 200ms $ease-out-quad; @@ -385,7 +365,7 @@ $_dot_color: $selected_bg_color; @include button(normal); - &.flat { + &.flat { @include button(undecorated); background-color: transparentize($button_bg, 1); border-color: transparentize($button_border, 1); @@ -751,10 +731,9 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 &:checked { color: $fg_color; } } -/********* - * Links * - *********/ - +// +// Links +// *:link { color: $link_color; &:visited { @@ -782,10 +761,9 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 } } -/***************** - * GtkSpinButton * - *****************/ - +// +// Spinbuttons +// .spinbutton { border-radius: 3px; @@ -796,8 +774,7 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 color: mix($fg_color,$base_color,95%); border-radius: 0; box-shadow: none; - // padding-left: 6px; - // padding-right: 6px; + &:dir(rtl) { border-style: none solid none none; } &:first-child { color: red; } @@ -873,8 +850,6 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 } } &.entry { - // we should remove the bottom edge hilight here, but seems - // like buttons are on top of it so it doesn't show up border-radius: 0; padding-left: 5px; padding-right: 5px; @@ -899,16 +874,18 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 } } -/************** - * ComboBoxes * - **************/ +// +// Comboboxes +// GtkComboBox { - > .button { padding-top: 3px; padding-bottom: 4px; } // Otherwise combos - // are bigger then - // buttons -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; + > .button { // Otherwise combos + padding-top: 3px; // are bigger than + padding-bottom: 4px; // buttons + } + &:insensitive { color: $insensitive_fg_color; } @@ -974,9 +951,9 @@ GtkComboBox { .linked.vertical > GtkComboBoxText:only-child > .button, .linked.vertical > GtkComboBox:only-child > .button { @extend %linked_vertical:only-child; } -/************ - * Toolbars * - ************/ +// +// Toolbars +// .toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -1026,10 +1003,9 @@ GtkComboBox { .action-bar { background-color: darken($bg_color, 3%) } -/*************** - * Header bars * - ***************/ - +// +// Headerbars +// .header-bar { padding: 7px 7px 6px 7px; @@ -1193,7 +1169,7 @@ GtkComboBox { } %header_widgets { - // Header-bar Entries + // Headerbar Entries .entry { @include entry(header-normal); @@ -1237,7 +1213,7 @@ GtkComboBox { } } - // Header-bar Buttons + // Headerbar Buttons .button { @include button(header-normal); @@ -1290,7 +1266,7 @@ GtkComboBox { } } - // Header-bar Suggested and Destructive Action buttons + // Headerbar Suggested and Destructive Action buttons @each $b_type, $b_color in (suggested-action, $suggested_color), (destructive-action, $destructive_color) { .button.#{$b_type} { @@ -1316,7 +1292,7 @@ GtkComboBox { } } - // Header-bar Spinbuttons + // Headerbar Spinbuttons & .spinbutton { &:focus .button { @@ -1334,7 +1310,7 @@ GtkComboBox { } } - // Header-bar ComboBoxes + // Headerbar ComboBoxes & GtkComboBox{ &:insensitive { color: transparentize($header_fg, 0.6); } @@ -1367,7 +1343,7 @@ GtkComboBox { } } - // Header-bar Switches + // Headerbar Switches GtkSwitch { &:backdrop { opacity: 0.75; } } @@ -1379,7 +1355,7 @@ GtkComboBox { &:backdrop { opacity: 0.75; } } - // Header-bar Scale + // Headerbar Scale .scale { &:backdrop { opacity: 0.75; } @@ -1413,9 +1389,9 @@ GtkComboBox { } } -/************ - * Pathbars * - ************/ +// +// Pathbars +// .path-bar .button { padding-left: 6px; padding-right: 6px; @@ -1431,9 +1407,9 @@ GtkComboBox { GtkLabel:only-child, GtkLabel { padding-right: 4px; padding-left: 4px; } } -/************** - * Tree Views * - **************/ +// +// Tree Views +// GtkTreeView.view { // treeview grid lines and expanders, unfortunatelly // the tree lines color can't be set -GtkTreeView-grid-line-width: 1; @@ -1559,9 +1535,9 @@ column-header.button.dnd { // for treeview-like derive widgets } } -/********* - * Menus * - *********/ +// +// Menus +// .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1639,10 +1615,9 @@ column-header.button.dnd { // for treeview-like derive widgets .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } -/************ - * Popovers * - ************/ - +// +// Popovers +// .popover { padding: 2px; border: 1px solid darken($borders_color, 5%); @@ -1676,17 +1651,10 @@ column-header.button.dnd { // for treeview-like derive widgets &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); } } -/***************** - * Notebooks and * - * Tabs * - *****************/ - +// +// Notebooks and Tabs +// .notebook { - // Through me you go to the grief wracked city; - // Through me you go to everlasting pain; - // Through me you go a pass among lost souls. - // ... - // Abandon all hope — Ye Who Enter Here padding: 0; background-color: $base_color; -GtkNotebook-initial-gap: 4; @@ -1700,15 +1668,13 @@ column-header.button.dnd { // for treeview-like derive widgets &.frame { border: 1px solid $borders_color; - // FIXME doesn't work + &.top { border-top-width: 0; } &.bottom { border-bottom-width: 0; } &.right { border-right-width: 0; } &.left { border-left-width: 0; } } &.header { - // FIXME: double borders in some case, can't fix it w/o a class tho - // FIXME: doesn't work on dark var background-color: $bg_color; // this is the shading of the header behind the tabs @@ -1721,18 +1687,10 @@ column-header.button.dnd { // for treeview-like derive widgets } $_header_border: $borders_color; - &.top { - box-shadow: inset 0 -1px $_header_border; // border - } - &.bottom { - box-shadow: inset 0 1px $_header_border; - } - &.right { - box-shadow: inset 1px 0 $_header_border; - } - &.left { - box-shadow: inset -1px 0 $_header_border; - } + &.top { box-shadow: inset 0 -1px $_header_border; } + &.bottom { box-shadow: inset 0 1px $_header_border; } + &.right { box-shadow: inset 1px 0 $_header_border; } + &.left { box-shadow: inset -1px 0 $_header_border; } } tab { border-width: 0; @@ -1853,10 +1811,9 @@ column-header.button.dnd { // for treeview-like derive widgets } } -/************** - * Scrollbars * - **************/ - +// +// Scrollbars +// $_scrollbar_bg_color: darken($base_color, 1%); .scrollbar { @@ -1990,9 +1947,9 @@ $_scrollbar_bg_color: darken($base_color, 1%); } -/********** - * Switch * - **********/ +// +// Switches +// GtkSwitch { font: 1; -GtkSwitch-slider-width: 41; @@ -2034,13 +1991,9 @@ GtkSwitch { } } -/************************* - * Check and Radio items * - *************************/ - -// draw regular check and radio items using our PNG assets -// all assets are rendered from assets.svg. never add pngs directly - +// +// Check and Radio items * +// @each $w,$a in ('check', 'checkbox'), ('radio','radio') { @@ -2074,7 +2027,7 @@ GtkSwitch { } } -//selection-mode +// Selectionmode @each $s,$as in ('','-selectionmode'), (':checked', '-checked-selectionmode') { GtkIconView.view.check#{$s}, @@ -2097,9 +2050,9 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } -/************ - * GtkScale * - ************/ +// +// GtkScale +// .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2206,15 +2159,13 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } -/***************** - * Progress bars * - *****************/ - +// +// Progress bars +// GtkProgressBar { padding: 0; font-size: smaller; color: transparentize($fg_color, 0.3); - //@include _shadows(_button_shadow(normal)); &.osd { -GtkProgressBar-xspacing: 0; @@ -2253,24 +2204,22 @@ GtkProgressBar.trough { border-style: none; background-color: transparent; box-shadow: none; - //FIXME: there is a margin on top } .list-row:selected &, GtkInfoBar & { background-color: transparentize(black, 0.8); } } -/************* - * Level Bar * - *************/ - +// +// Level Bar +// GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; -} -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; + &.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; + } } .level-bar { @@ -2306,9 +2255,9 @@ GtkLevelBar.vertical { } -/********** - * Frames * - **********/ +// +// Frames +// .frame { border: 1px solid $borders_color; &.flat { border-style: none; } @@ -2342,10 +2291,9 @@ GtkScrolledWindow { } } -/********* - * Lists * - *********/ - +// +// Lists +// .list, .list-row { background-color: $base_color; border-color: $borders_color; @@ -2390,10 +2338,9 @@ GtkScrolledWindow { &:hover { transition: none; } } -/********************* - * App Notifications * - *********************/ - +// +// App Notifications +// .app-notification, .app-notification.frame { padding: 10px; @@ -2419,10 +2366,9 @@ GtkScrolledWindow { } } -/************* - * Expanders * - *************/ - +// +// Expanders +// .expander { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } @@ -2430,9 +2376,9 @@ GtkScrolledWindow { &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } } -/************ - * Calendar * - ***********/ +// +// Calendar +// GtkCalendar { color: $fg_color; border: 1px solid $borders_color; @@ -2465,9 +2411,9 @@ GtkCalendar { &.highlight { color: gtkalpha(currentColor,0.55); } } -/*********** - * Dialogs * - ***********/ +// +// Dialogs +// .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2521,10 +2467,10 @@ GtkFileChooserDialog { } } -/*********** - * Sidebar * - ***********/ -.sidebar { +// +// Sidebar +// +.sidebar, .sidebar .view { border: none; background-color: $bg_color; @@ -2590,9 +2536,9 @@ GtkPaned.wide { // this is for the paned with wide separator &.vertical .pane-separator { border-style: solid none;} } -/************** - * GtkInfoBar * - **************/ +// +// GtkInfoBar +// GtkInfoBar { border-style: none; @@ -2648,9 +2594,9 @@ GtkInfoBar { } } -/************ - * Tooltips * - ************/ +// +// Tooltips +// .tooltip { &.background { // background-color needs to be set this way otherwise it gets drawn twice @@ -2673,9 +2619,9 @@ GtkInfoBar { color: inherit; // just to be sure } -/***************** - * Color Chooser * - *****************/ +// +// Color Chooser +// GtkColorSwatch { // This widget is made of two boxes one on top of the other, the lower box is GtkColorSwatch {} the other one @@ -2759,9 +2705,9 @@ GtkColorButton.button { GtkColorSwatch { border-radius: 0; } } -/******** - * Misc * - ********/ +// +// Misc * +// .scale-popup .button { // +/- buttons on GtkVolumeButton popup padding: 6px; &:hover { @@ -2771,23 +2717,49 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +// Decouple the font of context menus from their entry/textview +.touch-selection, +.context-menu { font: initial;} + +.monospace { font: Monospace; } + +// +// Overshoot +// +// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. +// This draws a box on top of the content, the size changes programmatically. +.overshoot { + &.top { @include overshoot(top); } + &.bottom { @include overshoot(bottom); } + &.left { @include overshoot(left); } + &.right { @include overshoot(right); } +} + +// +// Undershoot +// +// Overflow indication, works similarly to the overshoot, the size if fixed tho. +.undershoot { + &.top { @include undershoot(top); } + &.bottom { @include undershoot(bottom); } + &.left { @include undershoot(left); } + &.right { @include undershoot(right); } +} + +// +// Window Decorations +// .window-frame { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); - // lamefun trick to get rounded borders regardless of CSD use border-width: 0px; - // this needs to be transparent - // see bug #722563 $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.45)); box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), 0 8px 8px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); - /* this is used for the resize cursor area */ + // this is used for the resize cursor area margin: 10px; &:backdrop { @@ -2880,45 +2852,10 @@ GtkVolumeButton.button { padding: 8px; } } } - -// catch all extend :) - +// catch all extend %selected_items { background-image: none; background-color: $selected_bg_color; color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); } - -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; -} - -.monospace { - font: Monospace; -} - -// -// Overshoot -// -// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. -// This draws a box on top of the content, the size changes programmatically. -.overshoot { - &.top { @include overshoot(top); } - &.bottom { @include overshoot(bottom); } - &.left { @include overshoot(left); } - &.right { @include overshoot(right); } -} - -// -// Undershoot -// -// Overflow indication, works similarly to the overshoot, the size if fixed tho. -.undershoot { - &.top { @include undershoot(top); } - &.bottom { @include undershoot(bottom); } - &.left { @include undershoot(left); } - &.right { @include undershoot(right); } -} diff --git a/common/gtk-3.0/3.16/sass/_lightdm.scss b/common/gtk-3.0/3.16/sass/_lightdm.scss index 0879a5a..89cdfcd 100644 --- a/common/gtk-3.0/3.16/sass/_lightdm.scss +++ b/common/gtk-3.0/3.16/sass/_lightdm.scss @@ -1,11 +1,11 @@ -/* the panel widget at the top */ +// the panel widget at the top #panel_window { background-color: $panel_bg; color: $panel_fg; font: bold; box-shadow: inset 0 -1px darken($panel_bg, 7%); - /* the menubars/menus of the panel, i.e. indicators */ + // the menubars/menus of the panel, i.e. indicators .menubar, .menubar > .menuitem { background-color: transparent; @@ -21,7 +21,7 @@ .menubar .menu .menuitem { font: normal; } } -/* the login window */ +// the login window #login_window, #shutdown_dialog, #restart_dialog { @@ -31,7 +31,7 @@ color: $fg_color; } -/* the top half of the login-window, in GtkDialog terms, the content */ +// the top half of the login-window, in GtkDialog terms, the content #content_frame { padding-bottom: 14px; background-color: $bg_color; @@ -49,7 +49,7 @@ &:insensitive { @include button(insensitive); } } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ +// the lower half of the login-window, in GtkDialog terms the buttonbox or action area #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -78,16 +78,16 @@ .arrow {} } -/* the user's avatar box */ +// the user's avatar box #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ +// the border around the user's avatar box #user_image_border {} -/* the shutdown button */ +// the shutdown button #shutdown_button.button { @include button(suggested_destructive, $destructive_color); @@ -95,7 +95,7 @@ &:active, &:checked { @include button(suggested_destructive, darken($destructive_color, 10%)); } } -/* the restart button */ +// the restart button #restart_button.button { @include button(suggested_destructive, $suggested_color); @@ -103,7 +103,7 @@ &:active, &:checked { @include button(suggested_destructive, darken($suggested_color, 10%)); } } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ +// the warning, in case a wrong password is entered or something else goes wrong according to PAM #greeter_infobar { border-bottom-width: 0; font: bold; diff --git a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss index e3e8909..7d1e0c9 100644 --- a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss @@ -58,7 +58,7 @@ NautilusWindow .pane-separator, NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {background-color: $dark_sidebar_border} -/*Fix Nautilus transparency issues*/ +// Fix Nautilus transparency issues NautilusWindow NautilusWindowSlot { background-color: $base_color; } NautilusDesktopWindow NautilusWindowSlot { background-color: transparent; } diff --git a/common/gtk-3.0/3.16/sass/gtk-dark.scss b/common/gtk-3.0/3.16/sass/gtk-dark.scss index f47d7b5..529ee3d 100644 --- a/common/gtk-3.0/3.16/sass/gtk-dark.scss +++ b/common/gtk-3.0/3.16/sass/gtk-dark.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'dark'; $darker: 'false'; $transparency: 'true'; diff --git a/common/gtk-3.0/3.16/sass/gtk-darker.scss b/common/gtk-3.0/3.16/sass/gtk-darker.scss index 63166d2..34b8f81 100644 --- a/common/gtk-3.0/3.16/sass/gtk-darker.scss +++ b/common/gtk-3.0/3.16/sass/gtk-darker.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'true'; $transparency: 'true'; diff --git a/common/gtk-3.0/3.16/sass/gtk-solid-dark.scss b/common/gtk-3.0/3.16/sass/gtk-solid-dark.scss index 157292d..959d8b1 100644 --- a/common/gtk-3.0/3.16/sass/gtk-solid-dark.scss +++ b/common/gtk-3.0/3.16/sass/gtk-solid-dark.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'dark'; $darker: 'false'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.16/sass/gtk-solid-darker.scss b/common/gtk-3.0/3.16/sass/gtk-solid-darker.scss index 03ba34b..45b7dbe 100644 --- a/common/gtk-3.0/3.16/sass/gtk-solid-darker.scss +++ b/common/gtk-3.0/3.16/sass/gtk-solid-darker.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'true'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.16/sass/gtk-solid.scss b/common/gtk-3.0/3.16/sass/gtk-solid.scss index 347cf2c..28ff2b6 100644 --- a/common/gtk-3.0/3.16/sass/gtk-solid.scss +++ b/common/gtk-3.0/3.16/sass/gtk-solid.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'false'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.16/sass/gtk.scss b/common/gtk-3.0/3.16/sass/gtk.scss index c45d673..9bb0348 100644 --- a/common/gtk-3.0/3.16/sass/gtk.scss +++ b/common/gtk-3.0/3.16/sass/gtk.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'false'; $transparency: 'true'; diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 55de972..0ee4019 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -27,19 +27,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #D3DAE3; background-color: rgba(56, 60, 74, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -116,9 +107,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -134,9 +122,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -225,9 +210,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -746,7 +728,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . background-image: none; box-shadow: none; } -/* menu buttons */ .menuitem.button.flat, .menuitem.sidebar-button.button { transition: none; outline-offset: -1px; @@ -756,9 +737,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .menuitem.button.flat:checked, .menuitem.sidebar-button.button:checked { color: #D3DAE3; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #a9caf1; } *:link:visited, .button:visited { @@ -779,9 +757,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .button:link > .label, .button:visited > .label { text-decoration-line: underline; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -859,9 +834,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -887,9 +859,6 @@ GtkComboBox { border-top-right-radius: 0; border-bottom-right-radius: 0; } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -926,9 +895,6 @@ GtkComboBox { .action-bar { background-color: #313541; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1330,9 +1296,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); border-color: rgba(21, 23, 28, 0.67); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1347,9 +1310,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1431,9 +1391,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #383C4A; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1497,9 +1454,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #20222a; @@ -1531,10 +1485,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #404552; @@ -1667,9 +1617,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(211, 218, 227, 0.15); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1746,9 +1693,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 52; @@ -1810,9 +1754,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } @@ -1971,9 +1912,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(211, 218, 227, 0.45); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2054,9 +1992,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -2093,16 +2028,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2126,9 +2057,6 @@ GtkLevelBar.vertical { background-color: #404552; border-color: #404552; } -/********** - * Frames * - **********/ .frame { border: 1px solid #2b2e39; padding: 0; } @@ -2156,9 +2084,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list { background-color: #404552; border-color: #2b2e39; } @@ -2190,9 +2115,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.activatable:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2233,9 +2155,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2245,9 +2164,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #D3DAE3; border: 1px solid #2b2e39; @@ -2277,9 +2193,6 @@ GtkCalendar { GtkCalendar.highlight { color: #D3DAE3; } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2393,9 +2306,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2437,9 +2347,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2454,9 +2361,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2524,9 +2428,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .content-view { background-color: #404552; } .content-view:hover { @@ -2543,14 +2444,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.35); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } @@ -2665,86 +2641,6 @@ NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2918,11 +2814,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #D3DAE3; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #8a909b; font-size: smaller; } @@ -3580,13 +3474,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3599,7 +3491,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3608,7 +3499,6 @@ GtkListBox .h4 { background-color: transparent; color: #D3DAE3; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #383C4A; @@ -3639,7 +3529,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3677,13 +3566,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3703,7 +3589,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3723,7 +3608,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3860,7 +3744,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #404552; } @@ -4055,7 +3938,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; @define-color theme_bg_color #383C4A; @@ -4081,6 +3963,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7,0.8); @define-color wm_unfocused_title alpha(#cfdae7,0.5); @define-color wm_bg #2f343f; @@ -4098,4 +3981,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #666A74; @define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #404552; diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 0477e9f..8b6f8c2 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -27,19 +27,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: rgba(245, 246, 247, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -116,9 +107,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -134,9 +122,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -224,9 +209,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -745,7 +727,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . background-image: none; box-shadow: none; } -/* menu buttons */ .menuitem.button.flat, .menuitem.sidebar-button.button { transition: none; outline-offset: -1px; @@ -755,9 +736,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .menuitem.button.flat:checked, .menuitem.sidebar-button.button:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -778,9 +756,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .button:link > .label, .button:visited > .label { text-decoration-line: underline; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -858,9 +833,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -890,9 +862,6 @@ GtkComboBox { border-top-right-radius: 0; border-bottom-right-radius: 0; } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -929,9 +898,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1333,9 +1299,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(63, 69, 84, 0.991)); border-color: rgba(21, 23, 28, 0.67); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1350,9 +1313,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1434,9 +1394,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1500,9 +1457,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #cdd2d7; @@ -1534,10 +1488,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1670,9 +1620,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1749,9 +1696,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 52; @@ -1813,9 +1757,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1974,9 +1915,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2057,9 +1995,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -2096,16 +2031,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2129,9 +2060,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2159,9 +2087,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list { background-color: #ffffff; border-color: #dcdfe3; } @@ -2193,9 +2118,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.activatable:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2236,9 +2158,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2248,9 +2167,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2280,9 +2196,6 @@ GtkCalendar { GtkCalendar.highlight { color: #5c616c; } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2396,9 +2309,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2440,9 +2350,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2457,9 +2364,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2527,9 +2431,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .content-view { background-color: #ffffff; } .content-view:hover { @@ -2546,14 +2447,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.97), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2668,86 +2644,6 @@ NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2921,11 +2817,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #5c616c; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #aeb0b6; font-size: smaller; } @@ -3583,13 +3477,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3602,7 +3494,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3611,7 +3502,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3642,7 +3532,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3680,13 +3569,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3706,7 +3592,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3726,7 +3611,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3853,7 +3737,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } @@ -4048,7 +3931,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; @define-color theme_bg_color #F5F6F7; @@ -4074,6 +3956,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7,0.8); @define-color wm_unfocused_title alpha(#cfdae7,0.5); @define-color wm_bg #2f343f; @@ -4091,4 +3974,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #666A74; @define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 1233e50..e13a366 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -27,19 +27,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #D3DAE3; background-color: #383C4A; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -116,9 +107,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -134,9 +122,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -225,9 +210,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -746,7 +728,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . background-image: none; box-shadow: none; } -/* menu buttons */ .menuitem.button.flat, .menuitem.sidebar-button.button { transition: none; outline-offset: -1px; @@ -756,9 +737,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .menuitem.button.flat:checked, .menuitem.sidebar-button.button:checked { color: #D3DAE3; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #a9caf1; } *:link:visited, .button:visited { @@ -779,9 +757,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .button:link > .label, .button:visited > .label { text-decoration-line: underline; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -859,9 +834,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -887,9 +859,6 @@ GtkComboBox { border-top-right-radius: 0; border-bottom-right-radius: 0; } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -926,9 +895,6 @@ GtkComboBox { .action-bar { background-color: #313541; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1330,9 +1296,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #3e4553); border-color: rgba(21, 23, 28, 0.7); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1347,9 +1310,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1431,9 +1391,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #383C4A; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1497,9 +1454,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #20222a; @@ -1531,10 +1485,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #404552; @@ -1667,9 +1617,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(211, 218, 227, 0.15); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1746,9 +1693,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 52; @@ -1810,9 +1754,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } @@ -1971,9 +1912,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(211, 218, 227, 0.45); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2054,9 +1992,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -2093,16 +2028,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2126,9 +2057,6 @@ GtkLevelBar.vertical { background-color: #404552; border-color: #404552; } -/********** - * Frames * - **********/ .frame { border: 1px solid #2b2e39; padding: 0; } @@ -2156,9 +2084,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list { background-color: #404552; border-color: #2b2e39; } @@ -2190,9 +2115,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.activatable:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2233,9 +2155,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2245,9 +2164,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #D3DAE3; border: 1px solid #2b2e39; @@ -2277,9 +2193,6 @@ GtkCalendar { GtkCalendar.highlight { color: #D3DAE3; } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2393,9 +2306,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2437,9 +2347,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2454,9 +2361,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2524,9 +2428,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .content-view { background-color: #404552; } .content-view:hover { @@ -2543,14 +2444,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.35); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } @@ -2665,86 +2641,6 @@ NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2918,11 +2814,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #D3DAE3; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #8a909b; font-size: smaller; } @@ -3580,13 +3474,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3599,7 +3491,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3608,7 +3499,6 @@ GtkListBox .h4 { background-color: transparent; color: #D3DAE3; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #383C4A; @@ -3639,7 +3529,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3677,13 +3566,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3703,7 +3589,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3723,7 +3608,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3860,7 +3744,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #404552; } @@ -4055,7 +3938,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; @define-color theme_bg_color #383C4A; @@ -4081,6 +3963,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #404552; @define-color wm_title alpha(#cfdae7,0.8); @define-color wm_unfocused_title alpha(#cfdae7,0.5); @define-color wm_bg #2f343f; @@ -4098,4 +3981,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #666A74; @define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #404552; diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index f9e6786..81d8122 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -27,19 +27,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: #F5F6F7; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -116,9 +107,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -134,9 +122,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -224,9 +209,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -745,7 +727,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . background-image: none; box-shadow: none; } -/* menu buttons */ .menuitem.button.flat, .menuitem.sidebar-button.button { transition: none; outline-offset: -1px; @@ -755,9 +736,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .menuitem.button.flat:checked, .menuitem.sidebar-button.button:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -778,9 +756,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .button:link > .label, .button:visited > .label { text-decoration-line: underline; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -858,9 +833,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -890,9 +862,6 @@ GtkComboBox { border-top-right-radius: 0; border-bottom-right-radius: 0; } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -929,9 +898,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1333,9 +1299,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #3e4553); border-color: rgba(21, 23, 28, 0.7); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1350,9 +1313,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1434,9 +1394,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1500,9 +1457,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #cdd2d7; @@ -1534,10 +1488,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1670,9 +1620,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1749,9 +1696,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 52; @@ -1813,9 +1757,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1974,9 +1915,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2057,9 +1995,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -2096,16 +2031,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2129,9 +2060,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2159,9 +2087,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list { background-color: #ffffff; border-color: #dcdfe3; } @@ -2193,9 +2118,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.activatable:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2236,9 +2158,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2248,9 +2167,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2280,9 +2196,6 @@ GtkCalendar { GtkCalendar.highlight { color: #5c616c; } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2396,9 +2309,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2440,9 +2350,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2457,9 +2364,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2527,9 +2431,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .content-view { background-color: #ffffff; } .content-view:hover { @@ -2546,14 +2447,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 3px 3px 0 0; border-width: 0px; box-shadow: 0 0 0 1px #20232b, 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2668,86 +2644,6 @@ NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2921,11 +2817,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #5c616c; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #aeb0b6; font-size: smaller; } @@ -3583,13 +3477,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3602,7 +3494,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3611,7 +3502,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3642,7 +3532,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3680,13 +3569,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3706,7 +3592,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3726,7 +3611,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3853,7 +3737,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } @@ -4048,7 +3931,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; @define-color theme_bg_color #F5F6F7; @@ -4074,6 +3956,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #ffffff; @define-color wm_title alpha(#cfdae7,0.8); @define-color wm_unfocused_title alpha(#cfdae7,0.5); @define-color wm_bg #2f343f; @@ -4091,4 +3974,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #666A74; @define-color wm_icon_hover_bg #C4C7CC; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 6817fdd..3268098 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -27,19 +27,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: #F5F6F7; } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -116,9 +107,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -134,9 +122,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -224,9 +209,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -745,7 +727,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . background-image: none; box-shadow: none; } -/* menu buttons */ .menuitem.button.flat, .menuitem.sidebar-button.button { transition: none; outline-offset: -1px; @@ -755,9 +736,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .menuitem.button.flat:checked, .menuitem.sidebar-button.button:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -778,9 +756,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .button:link > .label, .button:visited > .label { text-decoration-line: underline; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -858,9 +833,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -890,9 +862,6 @@ GtkComboBox { border-top-right-radius: 0; border-bottom-right-radius: 0; } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -929,9 +898,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1337,9 +1303,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, #f5f5f7); border-color: rgba(82, 93, 118, 0.3); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1354,9 +1317,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1438,9 +1398,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1504,9 +1461,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #cdd2d7; @@ -1538,10 +1492,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1674,9 +1624,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1753,9 +1700,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 52; @@ -1817,9 +1761,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1978,9 +1919,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2061,9 +1999,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -2100,16 +2035,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2133,9 +2064,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2163,9 +2091,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list { background-color: #ffffff; border-color: #dcdfe3; } @@ -2197,9 +2122,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.activatable:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2240,9 +2162,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.4); background-color: rgba(102, 109, 132, 0.25); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2252,9 +2171,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2284,9 +2200,6 @@ GtkCalendar { GtkCalendar.highlight { color: #5c616c; } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2400,9 +2313,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2444,9 +2354,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2461,9 +2368,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2531,9 +2435,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .content-view { background-color: #ffffff; } .content-view:hover { @@ -2550,14 +2451,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2672,86 +2648,6 @@ NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2925,11 +2821,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #5c616c; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #aeb0b6; font-size: smaller; } @@ -3587,13 +3481,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: #2b2e37; color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px #1b1d23; - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px #1b1d23; } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3606,7 +3498,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3615,7 +3506,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3646,7 +3536,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3684,13 +3573,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3710,7 +3596,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3730,7 +3615,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3857,7 +3741,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } @@ -4052,7 +3935,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; @define-color theme_bg_color #F5F6F7; @@ -4078,6 +3960,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76,0.8); @define-color wm_unfocused_title alpha(#525d76,0.5); @define-color wm_bg #e7e8eb; @@ -4095,4 +3978,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #B6B8C0; @define-color wm_icon_hover_bg #7A7F8B; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index 5336cbc..ae395ff 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -27,19 +27,10 @@ outline-width: 1px; outline-radius: 2px; } -/*************** - * Base States * - ***************/ .background { color: #5c616c; background-color: rgba(245, 246, 247, 0.999); } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ *:insensitive { -gtk-image-effect: dim; } @@ -116,9 +107,6 @@ GtkTextView { outline-color: rgba(186, 195, 207, 0.3); box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -134,9 +122,6 @@ GtkTextView { .spinner:active:insensitive { opacity: 0.5; } -/**************** - * Text Entries * - ****************/ .entry { border: 1px solid; padding: 5px 8px 6px; @@ -224,9 +209,6 @@ GtkTextView { GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#5294E2), to(transparent)); } @@ -745,7 +727,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . background-image: none; box-shadow: none; } -/* menu buttons */ .menuitem.button.flat, .menuitem.sidebar-button.button { transition: none; outline-offset: -1px; @@ -755,9 +736,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .menuitem.button.flat:checked, .menuitem.sidebar-button.button:checked { color: #5c616c; } -/********* - * Links * - *********/ *:link, .button:link, .button:visited { color: #2679db; } *:link:visited, .button:visited { @@ -778,9 +756,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .button:link > .label, .button:visited > .label { text-decoration-line: underline; } -/***************** - * GtkSpinButton * - *****************/ .spinbutton { border-radius: 3px; } .spinbutton .button { @@ -858,9 +833,6 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . border-radius: 0; box-shadow: none; } -/************** - * ComboBoxes * - **************/ GtkComboBox { -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -890,9 +862,6 @@ GtkComboBox { border-top-right-radius: 0; border-bottom-right-radius: 0; } -/************ - * Toolbars * - ************/ .toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -929,9 +898,6 @@ GtkComboBox { .action-bar { background-color: #edeef0; } -/*************** - * Header bars * - ***************/ .header-bar { padding: 7px 7px 6px 7px; border-width: 0 0 1px; @@ -1337,9 +1303,6 @@ GtkComboBox { background-image: linear-gradient(to bottom, rgba(245, 246, 247, 0.985)); border-color: rgba(82, 93, 118, 0.3); } -/************ - * Pathbars * - ************/ .path-bar .button { padding-left: 6px; padding-right: 6px; } @@ -1354,9 +1317,6 @@ GtkComboBox { padding-right: 4px; padding-left: 4px; } -/************** - * Tree Views * - **************/ GtkTreeView.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; @@ -1438,9 +1398,6 @@ column-header .button, column-header .button:hover, column-header .button:active border-color: #F5F6F7; background-image: none; } -/********* - * Menus * - *********/ .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1504,9 +1461,6 @@ column-header .button, column-header .button:hover, column-header .button:active .menuitem .accelerator { color: alpha(currentColor,0.55); } -/************ - * Popovers * - ************/ .popover { padding: 2px; border: 1px solid #cdd2d7; @@ -1538,10 +1492,6 @@ column-header .button, column-header .button:hover, column-header .button:active .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -/***************** - * Notebooks and * - * Tabs * - *****************/ .notebook { padding: 0; background-color: #ffffff; @@ -1674,9 +1624,6 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.arrow:insensitive { color: rgba(92, 97, 108, 0.25); } -/************** - * Scrollbars * - **************/ .scrollbar { -GtkRange-slider-width: 13; -GtkRange-trough-border: 0; @@ -1753,9 +1700,6 @@ column-header .button, column-header .button:hover, column-header .button:active .scrollbars-junction.frame:dir(rtl) { border-image-slice: 0 1 0 0; } -/********** - * Switch * - **********/ GtkSwitch { font: 1; -GtkSwitch-slider-width: 52; @@ -1817,9 +1761,6 @@ GtkInfoBar GtkSwitch.trough:active:insensitive { .primary-toolbar GtkSwitch.trough:active:insensitive { background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } -/************************* - * Check and Radio items * - *************************/ .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1978,9 +1919,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent { color: rgba(92, 97, 108, 0.55); } -/************ - * GtkScale * - ************/ .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2061,9 +1999,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } -/***************** - * Progress bars * - *****************/ GtkProgressBar { padding: 0; font-size: smaller; @@ -2100,16 +2035,12 @@ GtkProgressBar.trough, .level-bar.trough { GtkInfoBar .level-bar.trough { background-color: rgba(0, 0, 0, 0.2); } -/************* - * Level Bar * - *************/ GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; } - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; } + GtkLevelBar.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; } .level-bar.trough { padding: 3px; @@ -2133,9 +2064,6 @@ GtkLevelBar.vertical { background-color: rgba(92, 97, 108, 0.2); border-color: rgba(92, 97, 108, 0.2); } -/********** - * Frames * - **********/ .frame { border: 1px solid #dcdfe3; padding: 0; } @@ -2163,9 +2091,6 @@ GtkScrolledWindow GtkViewport.frame { GtkFontButton .vertical.view.separator { -GtkWidget-wide-separators: true; } -/********* - * Lists * - *********/ .list { background-color: #ffffff; border-color: #dcdfe3; } @@ -2197,9 +2122,6 @@ GtkScrolledWindow GtkViewport.frame { .list-row:hover, list-row.activatable:hover { transition: none; } -/********************* - * App Notifications * - *********************/ .app-notification, .app-notification.frame { padding: 10px; @@ -2240,9 +2162,6 @@ GtkScrolledWindow GtkViewport.frame { border-color: rgba(26, 28, 34, 0.35); background-color: rgba(102, 109, 132, 0.2); } -/************* - * Expanders * - *************/ .expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .expander:dir(rtl) { @@ -2252,9 +2171,6 @@ GtkScrolledWindow GtkViewport.frame { .expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/************ - * Calendar * - ***********/ GtkCalendar { color: #5c616c; border: 1px solid #dcdfe3; @@ -2284,9 +2200,6 @@ GtkCalendar { GtkCalendar.highlight { color: #5c616c; } -/*********** - * Dialogs * - ***********/ .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2400,9 +2313,6 @@ GtkPaned.wide { GtkPaned.wide.vertical .pane-separator { border-style: solid none; } -/************** - * GtkInfoBar * - **************/ GtkInfoBar { border-style: none; } @@ -2444,9 +2354,6 @@ GtkInfoBar { background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.2); } -/************ - * Tooltips * - ************/ .tooltip { color: #BAC3CF; border-radius: 2px; } @@ -2461,9 +2368,6 @@ GtkInfoBar { background-color: transparent; color: inherit; } -/***************** - * Color Chooser * - *****************/ :selected GtkColorSwatch { box-shadow: none; } :selected GtkColorSwatch.overlay, :selected GtkColorSwatch.overlay:hover { @@ -2531,9 +2435,6 @@ GtkColorButton.button { GtkColorButton.button GtkColorSwatch { border-radius: 0; } -/******** - * Misc * - ********/ .content-view { background-color: #ffffff; } .content-view:hover { @@ -2550,14 +2451,89 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +.touch-selection, +.context-menu { + font: initial; } + +.monospace { + font: Monospace; } + +.overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; } + +.overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; } + +.undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; } + +.undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; } + +.undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; } + +.undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; } + .window-frame { border-radius: 4px 4px 0 0; border-width: 0px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 8px 8px 0 rgba(0, 0, 0, 0.2); - /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } @@ -2672,86 +2648,6 @@ NautilusWindow GtkPlacesSidebar.sidebar .has-open-popup:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; } - -.monospace { - font: Monospace; } - -.overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; } - -.overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(82, 148, 226, 0.2)), to(rgba(82, 148, 226, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; } - -.undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; } - -.undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; } - -.undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; } - -.undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; } - GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, @@ -2925,11 +2821,9 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . color: #ffffff; background-color: #5294E2; } -/* Only normal state is handle */ .open-document-selector-name-label { color: #5c616c; } -/* Only normal state is handle */ .open-document-selector-path-label { color: #aeb0b6; font-size: smaller; } @@ -3587,13 +3481,11 @@ GraniteWidgetsXsEntry.entry { GtkListBox .h4 { padding-left: 6px; } -/* the panel widget at the top */ #panel_window { background-color: rgba(43, 46, 55, 0.95); color: #BAC3CF; font: bold; - box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); - /* the menubars/menus of the panel, i.e. indicators */ } + box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); } #panel_window .menubar, #panel_window .menubar > .menuitem { background-color: transparent; @@ -3606,7 +3498,6 @@ GtkListBox .h4 { #panel_window .menubar .menu .menuitem { font: normal; } -/* the login window */ #login_window, #shutdown_dialog, #restart_dialog { @@ -3615,7 +3506,6 @@ GtkListBox .h4 { background-color: transparent; color: #5c616c; } -/* the top half of the login-window, in GtkDialog terms, the content */ #content_frame { padding-bottom: 14px; background-color: #F5F6F7; @@ -3646,7 +3536,6 @@ GtkListBox .h4 { #content_frame .button:insensitive > GtkLabel { color: inherit; } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -3684,13 +3573,10 @@ GtkListBox .h4 { #login_window #user_combobox .menu { font: normal; } -/* the user's avatar box */ #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ -/* the shutdown button */ #shutdown_button.button { background-clip: border-box; color: #ffffff; @@ -3710,7 +3596,6 @@ GtkListBox .h4 { background-color: #ec1b22; border-color: #ec1b22; } -/* the restart button */ #restart_button.button { background-clip: border-box; color: #ffffff; @@ -3730,7 +3615,6 @@ GtkListBox .h4 { background-color: #2e96c0; border-color: #2e96c0; } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ #greeter_infobar { border-bottom-width: 0; font: bold; } @@ -3857,7 +3741,6 @@ NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } -/*Fix Nautilus transparency issues*/ NautilusWindow NautilusWindowSlot { background-color: #ffffff; } @@ -4052,7 +3935,6 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive { background-color: transparent; } -/* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; @define-color theme_bg_color #F5F6F7; @@ -4078,6 +3960,7 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color error_color #FC4138; @define-color success_color #73d216; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #ffffff; @define-color wm_title alpha(#525d76,0.8); @define-color wm_unfocused_title alpha(#525d76,0.5); @define-color wm_bg #e7e8eb; @@ -4095,4 +3978,3 @@ MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserW @define-color wm_icon_unfocused_bg #B6B8C0; @define-color wm_icon_hover_bg #7A7F8B; @define-color wm_icon_active_bg #ffffff; -@define-color content_view_bg #ffffff; diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index e8f4765..0fe94ed 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -223,12 +223,10 @@ NemoWindow { } } -/* Only normal state is handle */ .open-document-selector-name-label { color: $fg_color; } -/* Only normal state is handle */ .open-document-selector-path-label { color: mix($fg_color, $base_color, 50%); font-size: smaller; diff --git a/common/gtk-3.0/3.18/sass/_colors-public.scss b/common/gtk-3.0/3.18/sass/_colors-public.scss index 4203b0c..8807853 100644 --- a/common/gtk-3.0/3.18/sass/_colors-public.scss +++ b/common/gtk-3.0/3.18/sass/_colors-public.scss @@ -1,5 +1,4 @@ //apps rely on some named colors to be exported -/* GTK NAMED COLORS */ // Sass thinks we're using the colors in the variables as strings and may shoot // warning, it's innocuous and can be defeated by using "" + $var @@ -30,6 +29,8 @@ @define-color success_color #{"" + $success_color}; @define-color placeholder_text_color #A8A8A8; +@define-color content_view_bg #{"" + $base_color}; + //WM $wm_highlight: lighten(opacify($header_bg, 1), 3%); $wm_bg_unfocused: opacify($header_bg_backdrop, 1); @@ -63,8 +64,3 @@ $wm_bg_unfocused: opacify($header_bg_backdrop, 1); @define-color wm_icon_hover_bg #{"" + $wm_icon_hover_bg}; @define-color wm_icon_active_bg #{"" + $wm_icon_active_bg}; - -//FIXME this is really an API - -@define-color content_view_bg #{"" + $base_color}; - diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index f1ff41f..27ef901 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -14,11 +14,6 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); -GtkCheckButton-indicator-size: 16; -GtkCheckMenuItem-indicator-size: 16; - // The size for scrollbars. The slider is 2px smaller, but we keep it - // up so that the whole area is sensitive to button presses for the - // slider. The stepper button is larger in both directions, the slider - // only in the width - -GtkScrolledWindow-scrollbar-spacing: 0; -GtkScrolledWindow-scrollbars-within-bevel: 1; @@ -46,9 +41,6 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); -GtkStatusbar-shadow-type: none; // We use the outline properties to signal the focus properties - // to the adwaita engine: using real CSS properties is faster, - // and we don't use any outlines for now. - outline-color: transparentize($fg_color, 0.7); outline-style: dashed; outline-offset: -3px; @@ -57,22 +49,14 @@ $darker_asset_suffix: if($darker=='true', '-dark', $asset_suffix); } -/*************** - * Base States * - ***************/ - +// +// Base States +// .background { color: $fg_color; background-color: if($transparency == 'true', transparentize($bg_color, 0.001), $bg_color); // without this headerbar transparency doesn't seem to work } -/* - These wildcard seems unavoidable, need to investigate. - Wildcards are bad and troublesome, use them with care, - or better, just don't. - Everytime a wildcard is used a kitten dies, painfully. -*/ - *:insensitive { -gtk-image-effect: dim; } @@ -180,10 +164,9 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers box-shadow: none; } -/********************** - * Spinner Animations * - **********************/ - +// +// Spinner Animations +// @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } } @@ -204,10 +187,9 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } } -/**************** - * Text Entries * - ****************/ - +// +// Text Entries +// .entry { border: 1px solid; padding: 5px 8px 6px; @@ -287,10 +269,9 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers GtkSearchEntry.entry { border-radius: 20px; } -/*********** - * Buttons * - ***********/ - +// +// Buttons +// // stuff for .needs-attention $_dot_color: $selected_bg_color; @@ -311,7 +292,6 @@ $_dot_color: $selected_bg_color; } } - .button { $_button_transition: all 200ms $ease-out-quad; @@ -778,7 +758,7 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 box-shadow: none; } -/* menu buttons */ +// menu buttons .menuitem.button.flat { transition: none; @extend %undecorated_button; @@ -792,10 +772,9 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 &:checked { color: $fg_color; } } -/********* - * Links * - *********/ - +// +// Links +// *:link { color: $link_color; &:visited { @@ -824,10 +803,9 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 > .label { text-decoration-line: underline; } } -/***************** - * GtkSpinButton * - *****************/ - +// +// Spinbuttons +// .spinbutton { border-radius: 3px; @@ -838,8 +816,7 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 color: mix($fg_color,$base_color,95%); border-radius: 0; box-shadow: none; - // padding-left: 6px; - // padding-right: 6px; + &:dir(rtl) { border-style: none solid none none; } &:first-child { color: red; } @@ -915,8 +892,6 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 } } &.entry { - // we should remove the bottom edge hilight here, but seems - // like buttons are on top of it so it doesn't show up border-radius: 0; padding-left: 5px; padding-right: 5px; @@ -941,23 +916,23 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0 } } -/************** - * ComboBoxes * - **************/ +// +// Comboboxes +// GtkComboBox { - > .the-button-in-the-combobox { padding-top: 3px; padding-bottom: 4px; } // Otherwise combos - // are bigger then - // buttons -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; + > .the-button-in-the-combobox { // Otherwise combos + padding-top: 3px; // are bigger than + padding-bottom: 4px; // buttons + } + &:insensitive { color: $insensitive_fg_color; } - .separator.vertical { - // always disable separators - -GtkWidget-wide-separators: true; - } + .separator.vertical { -GtkWidget-wide-separators: true; } + &.combobox-entry .entry { &:dir(ltr) { border-top-right-radius: 0; @@ -1016,9 +991,9 @@ GtkComboBox { .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox, .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox { @extend %linked_vertical:only-child; } -/************ - * Toolbars * - ************/ +// +// Toolbars +// .toolbar { -GtkWidget-window-dragging: true; padding: 4px; @@ -1068,10 +1043,9 @@ GtkComboBox { .action-bar { background-color: darken($bg_color, 3%) } -/*************** - * Header bars * - ***************/ - +// +// Headerbars +// .header-bar { padding: 7px 7px 6px 7px; @@ -1235,7 +1209,7 @@ GtkComboBox { } %header_widgets { - // Header-bar Entries + // Headerbar Entries .entry { @include entry(header-normal); @@ -1279,7 +1253,7 @@ GtkComboBox { } } - // Header-bar Buttons + // Headerbar Buttons .button { @include button(header-normal); @@ -1391,7 +1365,7 @@ GtkComboBox { } - // Header-bar Suggested and Destructive Action buttons + // Headerbar Suggested and Destructive Action buttons @each $b_type, $b_color in (suggested-action, $suggested_color), (destructive-action, $destructive_color) { .button.#{$b_type} { @@ -1417,7 +1391,7 @@ GtkComboBox { } } - // Header-bar Spinbuttons + // Headerbar Spinbuttons & .spinbutton { &:focus .button { @@ -1435,7 +1409,7 @@ GtkComboBox { } } - // Header-bar ComboBoxes + // Headerbar ComboBoxes & GtkComboBox{ &:insensitive { color: transparentize($header_fg, 0.6); } @@ -1462,7 +1436,7 @@ GtkComboBox { } - // Header-bar Switches + // Headerbar Switches GtkSwitch { &:backdrop { opacity: 0.75; } } @@ -1474,7 +1448,7 @@ GtkComboBox { &:backdrop { opacity: 0.75; } } - // Header-bar Scale + // Headerbar Scale .scale { &:backdrop { opacity: 0.75; } @@ -1508,9 +1482,9 @@ GtkComboBox { } } -/************ - * Pathbars * - ************/ +// +// Pathbars +// .path-bar .button { padding-left: 6px; padding-right: 6px; @@ -1526,9 +1500,9 @@ GtkComboBox { GtkLabel:only-child, GtkLabel { padding-right: 4px; padding-left: 4px; } } -/************** - * Tree Views * - **************/ +// +// Tree Views +// GtkTreeView.view { // treeview grid lines and expanders, unfortunatelly // the tree lines color can't be set -GtkTreeView-grid-line-width: 1; @@ -1540,7 +1514,7 @@ GtkTreeView.view { // treeview grid lines a border-left-color: transparentize($fg_color, 0.85); // this is actually the tree lines color, border-top-color: transparentize(black, 0.9); // while this is the grid lines color, better then nothing - &.rubberband { @extend .rubberband; } // to avoid borders being overridden by the previously set props + &.rubberband { @extend .rubberband; } // to avoid borders being overridden by the previously set props &:selected { border-radius: 0; @@ -1656,9 +1630,9 @@ column-header.button.dnd { // for treeview-like derive widgets } } -/********* - * Menus * - *********/ +// +// Menus +// .menubar { -GtkWidget-window-dragging: true; padding: 0px; @@ -1736,10 +1710,9 @@ column-header.button.dnd { // for treeview-like derive widgets .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } -/************ - * Popovers * - ************/ - +// +// Popovers +// .popover { padding: 2px; border: 1px solid darken($borders_color, 5%); @@ -1773,17 +1746,10 @@ column-header.button.dnd { // for treeview-like derive widgets &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); } } -/***************** - * Notebooks and * - * Tabs * - *****************/ - +// +// Notebooks and Tabs +// .notebook { - // Through me you go to the grief wracked city; - // Through me you go to everlasting pain; - // Through me you go a pass among lost souls. - // ... - // Abandon all hope — Ye Who Enter Here padding: 0; background-color: $base_color; -GtkNotebook-initial-gap: 4; @@ -1797,15 +1763,13 @@ column-header.button.dnd { // for treeview-like derive widgets &.frame { border: 1px solid $borders_color; - // FIXME doesn't work + &.top { border-top-width: 0; } &.bottom { border-bottom-width: 0; } &.right { border-right-width: 0; } &.left { border-left-width: 0; } } &.header { - // FIXME: double borders in some case, can't fix it w/o a class tho - // FIXME: doesn't work on dark var background-color: $bg_color; // this is the shading of the header behind the tabs @@ -1818,18 +1782,10 @@ column-header.button.dnd { // for treeview-like derive widgets } $_header_border: $borders_color; - &.top { - box-shadow: inset 0 -1px $_header_border; // border - } - &.bottom { - box-shadow: inset 0 1px $_header_border; - } - &.right { - box-shadow: inset 1px 0 $_header_border; - } - &.left { - box-shadow: inset -1px 0 $_header_border; - } + &.top { box-shadow: inset 0 -1px $_header_border; } + &.bottom { box-shadow: inset 0 1px $_header_border; } + &.right { box-shadow: inset 1px 0 $_header_border; } + &.left { box-shadow: inset -1px 0 $_header_border; } } tab { border-width: 0; @@ -1950,10 +1906,9 @@ column-header.button.dnd { // for treeview-like derive widgets } } -/************** - * Scrollbars * - **************/ - +// +// Scrollbars +// $_scrollbar_bg_color: darken($base_color, 1%); .scrollbar { @@ -2087,9 +2042,9 @@ $_scrollbar_bg_color: darken($base_color, 1%); } -/********** - * Switch * - **********/ +// +// Switches +// GtkSwitch { font: 1; -GtkSwitch-slider-width: 52; @@ -2132,13 +2087,9 @@ GtkSwitch { } } -/************************* - * Check and Radio items * - *************************/ - -// draw regular check and radio items using our PNG assets -// all assets are rendered from assets.svg. never add pngs directly - +// +// Check and Radio items * +// @each $w,$a in ('check', 'checkbox'), ('radio','radio') { @@ -2172,7 +2123,7 @@ GtkSwitch { } } -//selection-mode +// Selectionmode @each $s,$as in ('','-selectionmode'), (':checked', '-checked-selectionmode') { .view.content-view.check#{$s}:not(.list) { @@ -2194,9 +2145,9 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } -/************ - * GtkScale * - ************/ +// +// GtkScale +// .scale { -GtkScale-slider-length: 15; -GtkRange-slider-width: 15; @@ -2305,15 +2256,13 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } -/***************** - * Progress bars * - *****************/ - +// +// Progress bars +// GtkProgressBar { padding: 0; font-size: smaller; color: transparentize($fg_color, 0.3); - //@include _shadows(_button_shadow(normal)); &.osd { -GtkProgressBar-xspacing: 0; @@ -2352,24 +2301,22 @@ GtkProgressBar.trough { border-style: none; background-color: transparent; box-shadow: none; - //FIXME: there is a margin on top } .list-row:selected &, GtkInfoBar & { background-color: transparentize(black, 0.8); } } -/************* - * Level Bar * - *************/ - +// +// Level Bar +// GtkLevelBar { -GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-height: 3; -} -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; + &.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; + } } .level-bar { @@ -2405,9 +2352,9 @@ GtkLevelBar.vertical { } -/********** - * Frames * - **********/ +// +// Frames +// .frame { border: 1px solid $borders_color; &.flat { border-style: none; } @@ -2441,10 +2388,9 @@ GtkScrolledWindow { } } -/********* - * Lists * - *********/ - +// +// Lists +// .list { background-color: $base_color; border-color: $borders_color; @@ -2485,10 +2431,9 @@ GtkScrolledWindow { &:hover { transition: none; } } -/********************* - * App Notifications * - *********************/ - +// +// App Notifications +// .app-notification, .app-notification.frame { padding: 10px; @@ -2514,10 +2459,9 @@ GtkScrolledWindow { } } -/************* - * Expanders * - *************/ - +// +// Expanders +// .expander { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } @@ -2525,9 +2469,9 @@ GtkScrolledWindow { &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } } -/************ - * Calendar * - ***********/ +// +// Calendar +// GtkCalendar { color: $fg_color; border: 1px solid $borders_color; @@ -2563,9 +2507,9 @@ GtkCalendar { } } -/*********** - * Dialogs * - ***********/ +// +// Dialogs +// .message-dialog .dialog-action-area .button { padding: 8px; } @@ -2744,9 +2688,9 @@ GtkPaned.wide { // this is for the paned with wide separator &.vertical .pane-separator { border-style: solid none;} } -/************** - * GtkInfoBar * - **************/ +// +// GtkInfoBar +// GtkInfoBar { border-style: none; @@ -2802,9 +2746,9 @@ GtkInfoBar { } } -/************ - * Tooltips * - ************/ +// +// Tooltips +// .tooltip { &.background { // background-color needs to be set this way otherwise it gets drawn twice @@ -2827,9 +2771,9 @@ GtkInfoBar { color: inherit; // just to be sure } -/***************** - * Color Chooser * - *****************/ +// +// Color Chooser +// GtkColorSwatch { // This widget is made of two boxes one on top of the other, the lower box is GtkColorSwatch {} the other one @@ -2913,9 +2857,9 @@ GtkColorButton.button { GtkColorSwatch { border-radius: 0; } } -/******** - * Misc * - ********/ +// +// Misc +// //content view (grid/list) .content-view { background-color: $base_color; @@ -2932,23 +2876,49 @@ GtkColorButton.button { GtkVolumeButton.button { padding: 8px; } -/********************** - * Window Decorations * - *********************/ +// Decouple the font of context menus from their entry/textview +.touch-selection, +.context-menu { font: initial;} + +.monospace { font: Monospace; } + +// +// Overshoot +// +// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. +// This draws a box on top of the content, the size changes programmatically. +.overshoot { + &.top { @include overshoot(top); } + &.bottom { @include overshoot(bottom); } + &.left { @include overshoot(left); } + &.right { @include overshoot(right); } +} + +// +// Undershoot +// +// Overflow indication, works similarly to the overshoot, the size if fixed tho. +.undershoot { + &.top { @include undershoot(top); } + &.bottom { @include undershoot(bottom); } + &.left { @include undershoot(left); } + &.right { @include undershoot(right); } +} + +// +// Window Decorations +// .window-frame { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); - // lamefun trick to get rounded borders regardless of CSD use border-width: 0px; - // this needs to be transparent - // see bug #722563 $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.45)); box-shadow: 0 0 0 1px if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), $_wm_border), 0 8px 8px 0 if($variant == 'light', opacify($_wm_border, 0.1), transparentize($_wm_border, 0.2)); - /* this is used for the resize cursor area */ + // this is used for the resize cursor area margin: 10px; &:backdrop { @@ -3041,45 +3011,10 @@ GtkVolumeButton.button { padding: 8px; } } } - -// catch all extend :) - +// catch all extend %selected_items { background-image: none; background-color: $selected_bg_color; color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); } - -/* Decouple the font of context menus from their entry/textview */ -.touch-selection, -.context-menu { - font: initial; -} - -.monospace { - font: Monospace; -} - -// -// Overshoot -// -// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. -// This draws a box on top of the content, the size changes programmatically. -.overshoot { - &.top { @include overshoot(top); } - &.bottom { @include overshoot(bottom); } - &.left { @include overshoot(left); } - &.right { @include overshoot(right); } -} - -// -// Undershoot -// -// Overflow indication, works similarly to the overshoot, the size if fixed tho. -.undershoot { - &.top { @include undershoot(top); } - &.bottom { @include undershoot(bottom); } - &.left { @include undershoot(left); } - &.right { @include undershoot(right); } -} diff --git a/common/gtk-3.0/3.18/sass/_lightdm.scss b/common/gtk-3.0/3.18/sass/_lightdm.scss index 0879a5a..89cdfcd 100644 --- a/common/gtk-3.0/3.18/sass/_lightdm.scss +++ b/common/gtk-3.0/3.18/sass/_lightdm.scss @@ -1,11 +1,11 @@ -/* the panel widget at the top */ +// the panel widget at the top #panel_window { background-color: $panel_bg; color: $panel_fg; font: bold; box-shadow: inset 0 -1px darken($panel_bg, 7%); - /* the menubars/menus of the panel, i.e. indicators */ + // the menubars/menus of the panel, i.e. indicators .menubar, .menubar > .menuitem { background-color: transparent; @@ -21,7 +21,7 @@ .menubar .menu .menuitem { font: normal; } } -/* the login window */ +// the login window #login_window, #shutdown_dialog, #restart_dialog { @@ -31,7 +31,7 @@ color: $fg_color; } -/* the top half of the login-window, in GtkDialog terms, the content */ +// the top half of the login-window, in GtkDialog terms, the content #content_frame { padding-bottom: 14px; background-color: $bg_color; @@ -49,7 +49,7 @@ &:insensitive { @include button(insensitive); } } -/* the lower half of the login-window, in GtkDialog terms the buttonbox or action area */ +// the lower half of the login-window, in GtkDialog terms the buttonbox or action area #buttonbox_frame { padding-top: 20px; padding-bottom: 0px; @@ -78,16 +78,16 @@ .arrow {} } -/* the user's avatar box */ +// the user's avatar box #user_image { padding: 3px; border-radius: 2px; } -/* the border around the user's avatar box */ +// the border around the user's avatar box #user_image_border {} -/* the shutdown button */ +// the shutdown button #shutdown_button.button { @include button(suggested_destructive, $destructive_color); @@ -95,7 +95,7 @@ &:active, &:checked { @include button(suggested_destructive, darken($destructive_color, 10%)); } } -/* the restart button */ +// the restart button #restart_button.button { @include button(suggested_destructive, $suggested_color); @@ -103,7 +103,7 @@ &:active, &:checked { @include button(suggested_destructive, darken($suggested_color, 10%)); } } -/* the warning, in case a wrong password is entered or something else goes wrong according to PAM */ +// the warning, in case a wrong password is entered or something else goes wrong according to PAM #greeter_infobar { border-bottom-width: 0; font: bold; diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss index 758c606..d3c049c 100644 --- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss @@ -101,7 +101,7 @@ MarlinViewWindow { NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: $dark_sidebar_border } -/*Fix Nautilus transparency issues*/ +// Fix Nautilus transparency issues NautilusWindow NautilusWindowSlot { background-color: $base_color; } NautilusDesktopWindow NautilusWindowSlot { background-color: transparent; } diff --git a/common/gtk-3.0/3.18/sass/gtk-dark.scss b/common/gtk-3.0/3.18/sass/gtk-dark.scss index f47d7b5..529ee3d 100644 --- a/common/gtk-3.0/3.18/sass/gtk-dark.scss +++ b/common/gtk-3.0/3.18/sass/gtk-dark.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'dark'; $darker: 'false'; $transparency: 'true'; diff --git a/common/gtk-3.0/3.18/sass/gtk-darker.scss b/common/gtk-3.0/3.18/sass/gtk-darker.scss index 63166d2..34b8f81 100644 --- a/common/gtk-3.0/3.18/sass/gtk-darker.scss +++ b/common/gtk-3.0/3.18/sass/gtk-darker.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'true'; $transparency: 'true'; diff --git a/common/gtk-3.0/3.18/sass/gtk-solid-dark.scss b/common/gtk-3.0/3.18/sass/gtk-solid-dark.scss index 157292d..959d8b1 100644 --- a/common/gtk-3.0/3.18/sass/gtk-solid-dark.scss +++ b/common/gtk-3.0/3.18/sass/gtk-solid-dark.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'dark'; $darker: 'false'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.18/sass/gtk-solid-darker.scss b/common/gtk-3.0/3.18/sass/gtk-solid-darker.scss index 03ba34b..45b7dbe 100644 --- a/common/gtk-3.0/3.18/sass/gtk-solid-darker.scss +++ b/common/gtk-3.0/3.18/sass/gtk-solid-darker.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'true'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.18/sass/gtk-solid.scss b/common/gtk-3.0/3.18/sass/gtk-solid.scss index 347cf2c..28ff2b6 100644 --- a/common/gtk-3.0/3.18/sass/gtk-solid.scss +++ b/common/gtk-3.0/3.18/sass/gtk-solid.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'false'; $transparency: 'false'; diff --git a/common/gtk-3.0/3.18/sass/gtk.scss b/common/gtk-3.0/3.18/sass/gtk.scss index c45d673..9bb0348 100644 --- a/common/gtk-3.0/3.18/sass/gtk.scss +++ b/common/gtk-3.0/3.18/sass/gtk.scss @@ -1,8 +1,3 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade - $variant: 'light'; $darker: 'false'; $transparency: 'true'; diff --git a/configure.ac b/configure.ac index 607194e..af90f82 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_INIT( AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([no-dist-gzip dist-xz foreign]) AC_PROG_MKDIR_P ARC_ENABLE([LIGHT], [light], [Arc Light], [disable]) |