diff options
32 files changed, 1306 insertions, 1024 deletions
diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index dc02154..2e97930 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2" - inkscape:cx="20.299098" - inkscape:cy="169.82621" + inkscape:zoom="16" + inkscape:cx="405.59481" + inkscape:cy="392.29239" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -4685,7 +4685,7 @@ ry="0" inkscape:label="#rect6037" /> <rect - style="opacity:1;fill:#373b44;fill-opacity:1;stroke:#2d3036;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="opacity:1;fill:#383c45;fill-opacity:1;stroke:#2d3036;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="notebook" width="9" height="9" @@ -4698,25 +4698,23 @@ inkscape:label="Ebene 1" clip-path="url(#clipPath6057)"> <rect - ry="2" transform="translate(0,1022.3622)" y="0" x="0" height="33" width="30" id="rect2987" - style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="2" /> + style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - ry="1" + ry="1.3877788e-16" transform="translate(0,1022.3622)" y="1" x="1" height="31" width="28" id="rect3759" - style="fill:#373b44;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="1" /> + style="fill:#383c45;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + rx="1.3877788e-16" /> </g> <g transform="matrix(0,1,-1,0,1503.3622,-277.63782)" @@ -4724,25 +4722,23 @@ inkscape:label="Ebene 1" clip-path="url(#clipPath6057-7)"> <rect - ry="2" transform="translate(0,1022.3622)" y="0" x="0" height="33" width="30" id="rect2987-3" - style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="2" /> + style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - ry="1" + ry="1.3877788e-16" transform="translate(0,1022.3622)" y="1" x="1" height="31" width="28" id="rect3759-2" - style="fill:#373b44;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="1" /> + style="fill:#383c45;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + rx="1.3877788e-16" /> </g> <g transform="matrix(1,0,0,-1,416,808.72438)" @@ -4750,25 +4746,23 @@ inkscape:label="Ebene 1" clip-path="url(#clipPath6057-4)"> <rect - ry="2" transform="translate(0,1022.3622)" y="0" x="0" height="33" width="30" id="rect2987-2" - style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="2" /> + style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - ry="1" + ry="1.3877788e-16" transform="translate(0,1022.3622)" y="1" x="1" height="31" width="28" id="rect3759-3" - style="fill:#373b44;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="1" /> + style="fill:#383c45;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + rx="1.3877788e-16" /> </g> <g transform="matrix(0,-1,1,0,-571.3622,-213.63782)" @@ -4776,25 +4770,23 @@ inkscape:label="Ebene 1" clip-path="url(#clipPath6057-9)"> <rect - ry="2" transform="translate(0,1022.3622)" y="0" x="0" height="33" width="30" id="rect2987-28" - style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="2" /> + style="opacity:1;fill:#2d3036;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - ry="1" + ry="1.3877788e-16" transform="translate(0,1022.3622)" y="1" x="1" height="31" width="28" id="rect3759-6" - style="fill:#373b44;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="1" /> + style="fill:#383c45;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + rx="1.3877788e-16" /> </g> <g id="notebook-gap-horiz" @@ -4813,7 +4805,7 @@ height="2" width="2" id="rect6131" - style="opacity:1;fill:#373b44;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#383c45;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <g transform="matrix(0,1,-1,0,424,-659.63782)" @@ -4832,7 +4824,7 @@ height="2" width="2" id="rect6131-3" - style="opacity:1;fill:#373b44;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#383c45;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <rect style="opacity:1;fill:#3d414a;fill-opacity:1;stroke:#2d3036;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" diff --git a/common/gtk-2.0/assets-dark/notebook-gap-horiz.png b/common/gtk-2.0/assets-dark/notebook-gap-horiz.png Binary files differindex 2ff31be..92ae46d 100644 --- a/common/gtk-2.0/assets-dark/notebook-gap-horiz.png +++ b/common/gtk-2.0/assets-dark/notebook-gap-horiz.png diff --git a/common/gtk-2.0/assets-dark/notebook-gap-vert.png b/common/gtk-2.0/assets-dark/notebook-gap-vert.png Binary files differindex 4476997..fdc6702 100644 --- a/common/gtk-2.0/assets-dark/notebook-gap-vert.png +++ b/common/gtk-2.0/assets-dark/notebook-gap-vert.png diff --git a/common/gtk-2.0/assets-dark/notebook.png b/common/gtk-2.0/assets-dark/notebook.png Binary files differindex b689a32..1b4de44 100644 --- a/common/gtk-2.0/assets-dark/notebook.png +++ b/common/gtk-2.0/assets-dark/notebook.png diff --git a/common/gtk-2.0/assets-dark/tab-bottom-active.png b/common/gtk-2.0/assets-dark/tab-bottom-active.png Binary files differindex a20051a..b1b99cb 100644 --- a/common/gtk-2.0/assets-dark/tab-bottom-active.png +++ b/common/gtk-2.0/assets-dark/tab-bottom-active.png diff --git a/common/gtk-2.0/assets-dark/tab-left-active.png b/common/gtk-2.0/assets-dark/tab-left-active.png Binary files differindex ecdd045..54e5dd7 100644 --- a/common/gtk-2.0/assets-dark/tab-left-active.png +++ b/common/gtk-2.0/assets-dark/tab-left-active.png diff --git a/common/gtk-2.0/assets-dark/tab-right-active.png b/common/gtk-2.0/assets-dark/tab-right-active.png Binary files differindex 938cd3f..2047910 100644 --- a/common/gtk-2.0/assets-dark/tab-right-active.png +++ b/common/gtk-2.0/assets-dark/tab-right-active.png diff --git a/common/gtk-2.0/assets-dark/tab-top-active.png b/common/gtk-2.0/assets-dark/tab-top-active.png Binary files differindex a1c6678..5c67c69 100644 --- a/common/gtk-2.0/assets-dark/tab-top-active.png +++ b/common/gtk-2.0/assets-dark/tab-top-active.png diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index 6db0551..0ea70ce 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="293.34974" - inkscape:cy="302.58131" + inkscape:zoom="5.6568542" + inkscape:cx="449.14178" + inkscape:cy="382.90905" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -4713,17 +4713,15 @@ inkscape:label="Ebene 1" clip-path="url(#clipPath6057)"> <rect - ry="2" transform="translate(0,1022.3622)" y="0" x="0" height="33" width="30" id="rect2987" - style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="2" /> + style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - ry="1" + ry="1.3877788e-16" transform="translate(0,1022.3622)" y="1" x="1" @@ -4731,7 +4729,7 @@ width="28" id="rect3759" style="fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="1" /> + rx="1.3877788e-16" /> </g> <g transform="matrix(0,1,-1,0,1503.3622,-277.63782)" @@ -4739,17 +4737,15 @@ inkscape:label="Ebene 1" clip-path="url(#clipPath6057-7)"> <rect - ry="2" transform="translate(0,1022.3622)" y="0" x="0" height="33" width="30" id="rect2987-3" - style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="2" /> + style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - ry="1" + ry="1.3877788e-16" transform="translate(0,1022.3622)" y="1" x="1" @@ -4757,7 +4753,7 @@ width="28" id="rect3759-2" style="fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="1" /> + rx="1.3877788e-16" /> </g> <g transform="matrix(1,0,0,-1,416,808.72438)" @@ -4765,17 +4761,15 @@ inkscape:label="Ebene 1" clip-path="url(#clipPath6057-4)"> <rect - ry="2" transform="translate(0,1022.3622)" y="0" x="0" height="33" width="30" id="rect2987-2" - style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="2" /> + style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - ry="1" + ry="1.3877788e-16" transform="translate(0,1022.3622)" y="1" x="1" @@ -4783,7 +4777,7 @@ width="28" id="rect3759-3" style="fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="1" /> + rx="1.3877788e-16" /> </g> <g transform="matrix(0,-1,1,0,-571.3622,-213.63782)" @@ -4791,17 +4785,15 @@ inkscape:label="Ebene 1" clip-path="url(#clipPath6057-9)"> <rect - ry="2" transform="translate(0,1022.3622)" y="0" x="0" height="33" width="30" id="rect2987-28" - style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="2" /> + style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - ry="1" + ry="1.3877788e-16" transform="translate(0,1022.3622)" y="1" x="1" @@ -4809,7 +4801,7 @@ width="28" id="rect3759-6" style="fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - rx="1" /> + rx="1.3877788e-16" /> </g> <g id="notebook-gap-horiz" diff --git a/common/gtk-2.0/assets/tab-bottom-active.png b/common/gtk-2.0/assets/tab-bottom-active.png Binary files differindex ba936a3..e657180 100644 --- a/common/gtk-2.0/assets/tab-bottom-active.png +++ b/common/gtk-2.0/assets/tab-bottom-active.png diff --git a/common/gtk-2.0/assets/tab-left-active.png b/common/gtk-2.0/assets/tab-left-active.png Binary files differindex fd8e5cb..9819a88 100644 --- a/common/gtk-2.0/assets/tab-left-active.png +++ b/common/gtk-2.0/assets/tab-left-active.png diff --git a/common/gtk-2.0/assets/tab-right-active.png b/common/gtk-2.0/assets/tab-right-active.png Binary files differindex b648eaf..d2234ea 100644 --- a/common/gtk-2.0/assets/tab-right-active.png +++ b/common/gtk-2.0/assets/tab-right-active.png diff --git a/common/gtk-2.0/assets/tab-top-active.png b/common/gtk-2.0/assets/tab-top-active.png Binary files differindex fb5bb07..8838556 100644 --- a/common/gtk-2.0/assets/tab-top-active.png +++ b/common/gtk-2.0/assets/tab-top-active.png diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc index a3cd47e..16ae191 100644 --- a/common/gtk-2.0/gtkrc +++ b/common/gtk-2.0/gtkrc @@ -1,4 +1,4 @@ -gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#FEFEFE\ndark_sidebar_bg:#3c4049\ntooltip_bg_color:#3A4451\nlink_color:#5294E2" +gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#fefefe\ndark_sidebar_bg:#3c4049\ntooltip_bg_color:#3A4451\nlink_color:#5294E2" gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller. gtk-auto-mnemonics = 1 diff --git a/common/gtk-2.0/gtkrc-dark b/common/gtk-2.0/gtkrc-dark index 0be5915..b3440c7 100644 --- a/common/gtk-2.0/gtkrc-dark +++ b/common/gtk-2.0/gtkrc-dark @@ -1,4 +1,4 @@ -gtk-color-scheme = "base_color:#383C45\nfg_color:#D3DAE3\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#D3DAE3\nbg_color:#444852\ninsensitive_bg_color:#3a3e48\ninsensitive_fg_color:#7c818c\nnotebook_bg:#373B44\ndark_sidebar_bg:#454a54\ntooltip_bg_color:#3A4451\nlink_color:#5294E2" +gtk-color-scheme = "base_color:#383C45\nfg_color:#D3DAE3\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#D3DAE3\nbg_color:#444852\ninsensitive_bg_color:#3a3e48\ninsensitive_fg_color:#7c818c\nnotebook_bg:#383C45\ndark_sidebar_bg:#454a54\ntooltip_bg_color:#3A4451\nlink_color:#5294E2" gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller. gtk-auto-mnemonics = 1 diff --git a/common/gtk-2.0/gtkrc-darker b/common/gtk-2.0/gtkrc-darker index 80128b2..ae51aca 100644 --- a/common/gtk-2.0/gtkrc-darker +++ b/common/gtk-2.0/gtkrc-darker @@ -1,4 +1,4 @@ -gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#FEFEFE\ndark_sidebar_bg:#3c4049\ntooltip_bg_color:#3A4451\nlink_color:#5294E2" +gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#5c616c\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5294E2\nselected_fg_color:#FFFFFF\ntext_color:#5c616c\nbg_color:#F5F6F7\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9acb2\nnotebook_bg:#fefefe\ndark_sidebar_bg:#3c4049\ntooltip_bg_color:#3A4451\nlink_color:#5294E2" gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller. gtk-auto-mnemonics = 1 diff --git a/common/gtk-3.0/3.14/_applications.scss b/common/gtk-3.0/3.14/_applications.scss index db21334..adc6645 100644 --- a/common/gtk-3.0/3.14/_applications.scss +++ b/common/gtk-3.0/3.14/_applications.scss @@ -31,34 +31,37 @@ TerminalWindow { background-color: transparent; } - .notebook tab.reorderable-page, - .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; - } - .notebook { &.header.top { box-shadow: inset 0 1px opacify($header_border, 1), - inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%)); + inset 0 -1px $borders_color; } - tab { - .active-page GtkLabel { - color: $header_fg; - - &:backdrop { color: transparentize($header_fg, 0.3); } - } - - &.reorderable-page.top:active, - &.reorderable-page.top:active:hover { - background-color: opacify($header_bg, 1); - border-color: opacify($header_border, 1); - - &:backdrop { background-color: opacify($header_bg_backdrop, 1); } +/* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } } } +*/ } .scrollbar { @@ -102,6 +105,7 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar { padding: 5px; box-shadow: none; + background-color: $base_color; } @@ -226,17 +230,13 @@ GbSearchBox.linked { > GtkMenuButton.button:last-child:dir(ltr), > GtkMenuButton.button:first-child:dir(rtl) { - border-color: transparentize($header_fg, 0.7); - background-color: transparentize($button_bg, 0.1); + padding: 0 10px; - &:hover { - border-color: $selected_bg_color; - } - &:active, &:checked { - color: $selected_fg_color; - background-color: $selected_bg_color; - border-color: $selected_bg_color; - } + @include entry(header-normal); + + &:hover { @include entry(header-normal); border-color: $selected_bg_color; } + &:active, &:checked { @include entry(header-focus); } + &:insensitive { @include entry(header-insensitive); } } > GtkMenuButton.button:last-child:dir(ltr) { @@ -673,7 +673,7 @@ PantheonTerminalPantheonTerminalWindow.background { &.header.top { box-shadow: inset 0 1px opacify($header_border, 1), - inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%)); + inset 0 -1px $borders_color; } } } diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss index aa863be..b691ee0 100644 --- a/common/gtk-3.0/3.14/_common.scss +++ b/common/gtk-3.0/3.14/_common.scss @@ -1594,11 +1594,11 @@ column-header.button.dnd { // for treeview-like derive widgets // ... // Abandon all hope — Ye Who Enter Here padding: 0; - background-color: darken($base_color, 0.5%); - -GtkNotebook-initial-gap: 10; + background-color: $base_color; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1615,18 +1615,18 @@ column-header.button.dnd { // for treeview-like derive widgets &.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: mix($base_color, $bg_color, 50%); + background-color: $bg_color; // this is the shading of the header behind the tabs &.frame { - border: 1px solid $borders_color; + border: 0px solid $borders_color; &.top { border-bottom-width: 0; } &.bottom { border-top-width: 0; } &.right { border-left-width: 0; } &.left { border-right-width: 0; } } - $_header_border: if($variant == 'light', lighten($borders_color, 5%), $borders_color); + $_header_border: $borders_color; &.top { box-shadow: inset 0 -1px $_header_border; // border } @@ -1649,17 +1649,14 @@ column-header.button.dnd { // for treeview-like derive widgets outline-offset: 0; - //vertical tab sizing - $vt_vpadding: 5px; - $vt_hpadding: 20px; - // horizontal tab sizing - $ht_vpadding: 5px; - $ht_hpadding: 20px; + // tab sizing + $vpadding: 4px; + $hpadding: 15px; //FIXME: we get double border in some cases, not considering the broken //notebook content frame... - &.top, &.bottom { padding: $vt_vpadding $vt_hpadding; } - &.left, &.right { padding: $ht_vpadding $ht_hpadding; } + &.top, &.bottom { padding: $vpadding $hpadding; } + &.left, &.right { padding: $vpadding $hpadding; } &.reorderable-page { &.top, &.bottom { @@ -1675,19 +1672,58 @@ column-header.button.dnd { // for treeview-like derive widgets } @each $_tab in (top, bottom, right, left) { &.reorderable-page.#{$_tab}, &.#{$_tab} { + + @if $_tab==top or $_tab==bottom { + padding-#{$_tab}: $vpadding + 2; + } + @else if $_tab==left or $_tab==right { + padding-#{$_tab}: $hpadding + 2; + } + + @if $_tab==top { border-radius: 3.5px 2px 0 0; } + @else if $_tab==bottom { border-radius: 0 0 2px 3.5px; } + @else if $_tab==left { border-radius: 3.5px 0 0 3.5px; } + @else if $_tab==right { border-radius: 0 3.5px 3.5px 0; } + + border-width: 0; + border-#{$_tab}-width: 2px; border-color: transparent; + background-color: transparentize($base_color, 1); + &:hover, &.prelight-page { - border-color: transparentize($borders_color, 0.5); - border-width: 1px; - border-#{$_tab}-width: 0; - background-color: transparentize($bg_color,0.8); + background-color: transparentize($base_color, 0.5); + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $borders_color, + inset 1px 0 $borders_color, + inset -1px 0 $borders_color; } &:active, &.active-page, &.active-page:hover { - border-width: 1px; - border-#{$_tab}-width: 0; - border-color: $borders_color; - background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.85)); - &:hover { background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.85)); } + background-color: $base_color; + + @if $_tab==top { + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $base_color, + inset 1px 0 $borders_color, + inset -1px 0 $borders_color; + } + @else if $_tab==bottom { + box-shadow: inset 0 -1px $base_color, + inset 0 -1px $borders_color, + inset 1px 0 $borders_color, + inset -1px 0 $borders_color; + } + @else if $_tab==left { + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $borders_color, + inset 1px 0 $borders_color, + inset -1px 0 $base_color; + } + @else if $_tab==right { + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $borders_color, + inset 1px 0 $base_color, + inset -1px 0 $borders_color; + } } } } diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 7d61f94..3c3c731 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -1261,11 +1261,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #373b44; - -GtkNotebook-initial-gap: 10; + background-color: #383C45; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1281,9 +1281,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #3e424b; } + background-color: #444852; } .notebook.header.frame { - border: 1px solid #2d3036; } + border: 0px solid #2d3036; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1308,68 +1308,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(211, 218, 227, 0.45); } @@ -2467,21 +2463,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(207, 218, 231, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(207, 218, 231, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #2f343b; - border-color: #24272d; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #32383f; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2511,7 +2519,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #383C45; } NemoWindow .sidebar .frame { border-width: 0; } @@ -2602,17 +2611,36 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { - border-color: rgba(207, 218, 231, 0.1); - background-color: rgba(61, 65, 75, 0.9); } + padding: 0 10px; + color: rgba(207, 218, 231, 0.8); + border-color: rgba(24, 27, 31, 0.97); + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + background-color: transparent; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { + color: rgba(207, 218, 231, 0.8); + border-color: rgba(24, 27, 31, 0.97); + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + background-color: transparent; border-color: #5294E2; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - background-color: #5294E2; - border-color: #5294E2; } + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { + color: rgba(207, 218, 231, 0.35); + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; border-radius: 0 14.5px 14.5px 0; @@ -2939,7 +2967,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; } + box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index 7802b35..b1968f4 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -1262,11 +1262,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #fefefe; - -GtkNotebook-initial-gap: 10; + background-color: #ffffff; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1282,9 +1282,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #fafafb; } + background-color: #F5F6F7; } .notebook.header.frame { - border: 1px solid #dcdfe3; } + border: 0px solid #dcdfe3; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1294,13 +1294,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #eaecee; } + box-shadow: inset 0 -1px #dcdfe3; } .notebook.header.bottom { - box-shadow: inset 0 1px #eaecee; } + box-shadow: inset 0 1px #dcdfe3; } .notebook.header.right { - box-shadow: inset 1px 0 #eaecee; } + box-shadow: inset 1px 0 #dcdfe3; } .notebook.header.left { - box-shadow: inset -1px 0 #eaecee; } + box-shadow: inset -1px 0 #dcdfe3; } .notebook tab { border-width: 0; border-style: solid; @@ -1309,68 +1309,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(92, 97, 108, 0.55); } @@ -2468,21 +2464,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(207, 218, 231, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(207, 218, 231, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #2f343b; - border-color: #1f2227; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #32383f; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2512,7 +2520,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #ffffff; } NemoWindow .sidebar .frame { border-width: 0; } @@ -2603,17 +2612,36 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { - border-color: rgba(207, 218, 231, 0.1); - background-color: rgba(251, 251, 252, 0.9); } + padding: 0 10px; + color: rgba(207, 218, 231, 0.8); + border-color: rgba(24, 27, 31, 0.97); + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + background-color: transparent; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { + color: rgba(207, 218, 231, 0.8); + border-color: rgba(24, 27, 31, 0.97); + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); + background-color: transparent; border-color: #5294E2; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - background-color: #5294E2; - border-color: #5294E2; } + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { + color: rgba(207, 218, 231, 0.35); + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.52)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; border-radius: 0 14.5px 14.5px 0; @@ -2940,7 +2968,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; } + box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index d36655d..7fc06fa 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -1261,11 +1261,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #373b44; - -GtkNotebook-initial-gap: 10; + background-color: #383C45; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1281,9 +1281,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #3e424b; } + background-color: #444852; } .notebook.header.frame { - border: 1px solid #2d3036; } + border: 0px solid #2d3036; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1308,68 +1308,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(211, 218, 227, 0.45); } @@ -2467,21 +2463,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(207, 218, 231, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(207, 218, 231, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #2f343b; - border-color: #24272d; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #32383f; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2511,7 +2519,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #383C45; } NemoWindow .sidebar .frame { border-width: 0; } @@ -2602,17 +2611,36 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { - border-color: rgba(207, 218, 231, 0.1); - background-color: rgba(61, 65, 75, 0.9); } + padding: 0 10px; + color: rgba(207, 218, 231, 0.8); + border-color: #181b1f; + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + background-color: transparent; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { + color: rgba(207, 218, 231, 0.8); + border-color: #181b1f; + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + background-color: transparent; border-color: #5294E2; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - background-color: #5294E2; - border-color: #5294E2; } + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { + color: rgba(207, 218, 231, 0.35); + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; border-radius: 0 14.5px 14.5px 0; @@ -2939,7 +2967,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; } + box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 5d48c48..c3a5dd2 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -1262,11 +1262,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #fefefe; - -GtkNotebook-initial-gap: 10; + background-color: #ffffff; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1282,9 +1282,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #fafafb; } + background-color: #F5F6F7; } .notebook.header.frame { - border: 1px solid #dcdfe3; } + border: 0px solid #dcdfe3; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1294,13 +1294,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #eaecee; } + box-shadow: inset 0 -1px #dcdfe3; } .notebook.header.bottom { - box-shadow: inset 0 1px #eaecee; } + box-shadow: inset 0 1px #dcdfe3; } .notebook.header.right { - box-shadow: inset 1px 0 #eaecee; } + box-shadow: inset 1px 0 #dcdfe3; } .notebook.header.left { - box-shadow: inset -1px 0 #eaecee; } + box-shadow: inset -1px 0 #dcdfe3; } .notebook tab { border-width: 0; border-style: solid; @@ -1309,68 +1309,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(92, 97, 108, 0.55); } @@ -2468,21 +2464,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(207, 218, 231, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(207, 218, 231, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #2f343b; - border-color: #1f2227; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #32383f; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2512,7 +2520,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #ffffff; } NemoWindow .sidebar .frame { border-width: 0; } @@ -2603,17 +2612,36 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { - border-color: rgba(207, 218, 231, 0.1); - background-color: rgba(251, 251, 252, 0.9); } + padding: 0 10px; + color: rgba(207, 218, 231, 0.8); + border-color: #181b1f; + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + background-color: transparent; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { + color: rgba(207, 218, 231, 0.8); + border-color: #181b1f; + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); + background-color: transparent; border-color: #5294E2; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - background-color: #5294E2; - border-color: #5294E2; } + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { + color: rgba(207, 218, 231, 0.35); + background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.55)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; border-radius: 0 14.5px 14.5px 0; @@ -2940,7 +2968,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; } + box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 63d80a7..c145f9e 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -1261,11 +1261,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #fefefe; - -GtkNotebook-initial-gap: 10; + background-color: #ffffff; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1281,9 +1281,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #fafafb; } + background-color: #F5F6F7; } .notebook.header.frame { - border: 1px solid #dcdfe3; } + border: 0px solid #dcdfe3; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1293,13 +1293,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #eaecee; } + box-shadow: inset 0 -1px #dcdfe3; } .notebook.header.bottom { - box-shadow: inset 0 1px #eaecee; } + box-shadow: inset 0 1px #dcdfe3; } .notebook.header.right { - box-shadow: inset 1px 0 #eaecee; } + box-shadow: inset 1px 0 #dcdfe3; } .notebook.header.left { - box-shadow: inset -1px 0 #eaecee; } + box-shadow: inset -1px 0 #dcdfe3; } .notebook tab { border-width: 0; border-style: solid; @@ -1308,68 +1308,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(92, 97, 108, 0.55); } @@ -2467,21 +2463,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(82, 93, 118, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(82, 93, 118, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #e7e8eb; - border-color: #d4d5db; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #eff0f2; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2511,7 +2519,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #ffffff; } NemoWindow .sidebar .frame { border-width: 0; } @@ -2602,17 +2611,36 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { + padding: 0 10px; + color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); - background-color: rgba(251, 251, 252, 0.9); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); + background-color: transparent; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { + color: rgba(82, 93, 118, 0.8); + border-color: rgba(82, 93, 118, 0.1); + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); + background-color: transparent; border-color: #5294E2; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - background-color: #5294E2; - border-color: #5294E2; } + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { + color: rgba(82, 93, 118, 0.35); + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; border-radius: 0 14.5px 14.5px 0; @@ -2939,7 +2967,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; } + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 1a3eaee..fe29c2e 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -1261,11 +1261,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #fefefe; - -GtkNotebook-initial-gap: 10; + background-color: #ffffff; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1281,9 +1281,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #fafafb; } + background-color: #F5F6F7; } .notebook.header.frame { - border: 1px solid #dcdfe3; } + border: 0px solid #dcdfe3; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1293,13 +1293,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #eaecee; } + box-shadow: inset 0 -1px #dcdfe3; } .notebook.header.bottom { - box-shadow: inset 0 1px #eaecee; } + box-shadow: inset 0 1px #dcdfe3; } .notebook.header.right { - box-shadow: inset 1px 0 #eaecee; } + box-shadow: inset 1px 0 #dcdfe3; } .notebook.header.left { - box-shadow: inset -1px 0 #eaecee; } + box-shadow: inset -1px 0 #dcdfe3; } .notebook tab { border-width: 0; border-style: solid; @@ -1308,68 +1308,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(92, 97, 108, 0.55); } @@ -2467,21 +2463,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(82, 93, 118, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(82, 93, 118, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #e7e8eb; - border-color: #d4d5db; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #eff0f2; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2511,7 +2519,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #ffffff; } NemoWindow .sidebar .frame { border-width: 0; } @@ -2602,17 +2611,36 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { + padding: 0 10px; + color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); - background-color: rgba(251, 251, 252, 0.9); } + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); + background-color: transparent; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { + color: rgba(82, 93, 118, 0.8); + border-color: rgba(82, 93, 118, 0.1); + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); + background-color: transparent; border-color: #5294E2; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover.image:hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover.image:hover { + color: inherit; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { color: #ffffff; - background-color: #5294E2; - border-color: #5294E2; } + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive { + color: rgba(82, 93, 118, 0.35); + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; border-radius: 0 14.5px 14.5px 0; @@ -2939,7 +2967,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; } + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss index dc5b3cb..2d89bed 100644 --- a/common/gtk-3.0/3.16/_applications.scss +++ b/common/gtk-3.0/3.16/_applications.scss @@ -31,34 +31,37 @@ TerminalWindow { background-color: transparent; } - .notebook tab.reorderable-page, - .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; - } - .notebook { &.header.top { box-shadow: inset 0 1px opacify($header_border, 1), - inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%)); + inset 0 -1px $borders_color; } - tab { - .active-page GtkLabel { - color: $header_fg; - - &:backdrop { color: transparentize($header_fg, 0.3); } - } - - &.reorderable-page.top:active, - &.reorderable-page.top:active:hover { - background-color: opacify($header_bg, 1); - border-color: opacify($header_border, 1); - - &:backdrop { background-color: opacify($header_bg_backdrop, 1); } +/* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } } } +*/ } .scrollbar { @@ -105,6 +108,7 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar { padding: 5px; box-shadow: none; + background-color: $base_color; } .nautilus-circular-button { @@ -717,7 +721,7 @@ PantheonTerminalPantheonTerminalWindow.background { &.header.top { box-shadow: inset 0 1px opacify($header_border, 1), - inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%)); + inset 0 -1px $borders_color; } } } diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss index b60279a..5a38722 100644 --- a/common/gtk-3.0/3.16/_common.scss +++ b/common/gtk-3.0/3.16/_common.scss @@ -1615,11 +1615,11 @@ column-header.button.dnd { // for treeview-like derive widgets // ... // Abandon all hope — Ye Who Enter Here padding: 0; - background-color: darken($base_color, 0.5%); - -GtkNotebook-initial-gap: 10; + background-color: $base_color; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1636,18 +1636,18 @@ column-header.button.dnd { // for treeview-like derive widgets &.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: mix($base_color, $bg_color, 50%); + background-color: $bg_color; // this is the shading of the header behind the tabs &.frame { - border: 1px solid $borders_color; + border: 0px solid $borders_color; &.top { border-bottom-width: 0; } &.bottom { border-top-width: 0; } &.right { border-left-width: 0; } &.left { border-right-width: 0; } } - $_header_border: if($variant == 'light', lighten($borders_color, 5%), $borders_color); + $_header_border: $borders_color; &.top { box-shadow: inset 0 -1px $_header_border; // border } @@ -1670,17 +1670,14 @@ column-header.button.dnd { // for treeview-like derive widgets outline-offset: 0; - //vertical tab sizing - $vt_vpadding: 5px; - $vt_hpadding: 20px; - // horizontal tab sizing - $ht_vpadding: 5px; - $ht_hpadding: 20px; + // tab sizing + $vpadding: 4px; + $hpadding: 15px; //FIXME: we get double border in some cases, not considering the broken //notebook content frame... - &.top, &.bottom { padding: $vt_vpadding $vt_hpadding; } - &.left, &.right { padding: $ht_vpadding $ht_hpadding; } + &.top, &.bottom { padding: $vpadding $hpadding; } + &.left, &.right { padding: $vpadding $hpadding; } &.reorderable-page { &.top, &.bottom { @@ -1696,19 +1693,58 @@ column-header.button.dnd { // for treeview-like derive widgets } @each $_tab in (top, bottom, right, left) { &.reorderable-page.#{$_tab}, &.#{$_tab} { + + @if $_tab==top or $_tab==bottom { + padding-#{$_tab}: $vpadding + 2; + } + @else if $_tab==left or $_tab==right { + padding-#{$_tab}: $hpadding + 2; + } + + @if $_tab==top { border-radius: 3.5px 2px 0 0; } + @else if $_tab==bottom { border-radius: 0 0 2px 3.5px; } + @else if $_tab==left { border-radius: 3.5px 0 0 3.5px; } + @else if $_tab==right { border-radius: 0 3.5px 3.5px 0; } + + border-width: 0; + border-#{$_tab}-width: 2px; border-color: transparent; + background-color: transparentize($base_color, 1); + &:hover, &.prelight-page { - border-color: transparentize($borders_color, 0.5); - border-width: 1px; - border-#{$_tab}-width: 0; - background-color: transparentize($bg_color,0.8); + background-color: transparentize($base_color, 0.5); + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $borders_color, + inset 1px 0 $borders_color, + inset -1px 0 $borders_color; } &:active, &.active-page, &.active-page:hover { - border-width: 1px; - border-#{$_tab}-width: 0; - border-color: $borders_color; - background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.85)); - &:hover { background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.85)); } + background-color: $base_color; + + @if $_tab==top { + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $base_color, + inset 1px 0 $borders_color, + inset -1px 0 $borders_color; + } + @else if $_tab==bottom { + box-shadow: inset 0 -1px $base_color, + inset 0 -1px $borders_color, + inset 1px 0 $borders_color, + inset -1px 0 $borders_color; + } + @else if $_tab==left { + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $borders_color, + inset 1px 0 $borders_color, + inset -1px 0 $base_color; + } + @else if $_tab==right { + box-shadow: inset 0 1px $borders_color, + inset 0 -1px $borders_color, + inset 1px 0 $base_color, + inset -1px 0 $borders_color; + } } } } diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 6a38c09..715df3c 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -1276,11 +1276,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #373b44; - -GtkNotebook-initial-gap: 10; + background-color: #383C45; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1296,9 +1296,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #3e424b; } + background-color: #444852; } .notebook.header.frame { - border: 1px solid #2d3036; } + border: 0px solid #2d3036; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1323,68 +1323,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(211, 218, 227, 0.45); } @@ -2378,21 +2374,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(207, 218, 231, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(207, 218, 231, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #2f343b; - border-color: #24272d; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #32383f; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2430,7 +2438,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #383C45; } .nautilus-circular-button { border-radius: 50%; @@ -2905,7 +2914,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; } + box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index fb7dd43..a4f6013 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -1277,11 +1277,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #fefefe; - -GtkNotebook-initial-gap: 10; + background-color: #ffffff; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1297,9 +1297,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #fafafb; } + background-color: #F5F6F7; } .notebook.header.frame { - border: 1px solid #dcdfe3; } + border: 0px solid #dcdfe3; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1309,13 +1309,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #eaecee; } + box-shadow: inset 0 -1px #dcdfe3; } .notebook.header.bottom { - box-shadow: inset 0 1px #eaecee; } + box-shadow: inset 0 1px #dcdfe3; } .notebook.header.right { - box-shadow: inset 1px 0 #eaecee; } + box-shadow: inset 1px 0 #dcdfe3; } .notebook.header.left { - box-shadow: inset -1px 0 #eaecee; } + box-shadow: inset -1px 0 #dcdfe3; } .notebook tab { border-width: 0; border-style: solid; @@ -1324,68 +1324,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(92, 97, 108, 0.55); } @@ -2379,21 +2375,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(207, 218, 231, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(207, 218, 231, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #2f343b; - border-color: #1f2227; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #32383f; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2431,7 +2439,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #ffffff; } .nautilus-circular-button { border-radius: 50%; @@ -2906,7 +2915,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; } + box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index f42002a..866c82c 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -1276,11 +1276,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #373b44; - -GtkNotebook-initial-gap: 10; + background-color: #383C45; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1296,9 +1296,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #3e424b; } + background-color: #444852; } .notebook.header.frame { - border: 1px solid #2d3036; } + border: 0px solid #2d3036; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1323,68 +1323,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #383C45, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 -1px #383C45, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #383C45, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(56, 60, 69, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(45, 48, 54, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(68, 72, 82, 0.2); } + background-color: rgba(56, 60, 69, 0.5); + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #2d3036; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #2d3036; - background-color: rgba(0, 0, 0, 0.15); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: #383C45; + box-shadow: inset 0 1px #2d3036, inset 0 -1px #2d3036, inset 1px 0 #2d3036, inset -1px 0 #383C45; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(211, 218, 227, 0.45); } @@ -2378,21 +2374,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(207, 218, 231, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(207, 218, 231, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #2f343b; - border-color: #24272d; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #32383f; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2430,7 +2438,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #383C45; } .nautilus-circular-button { border-radius: 50%; @@ -2905,7 +2914,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #24272d, inset 0 -1px #2f3239; } + box-shadow: inset 0 1px #24272d, inset 0 -1px #2d3036; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index 5eb7f19..5907ea6 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -1277,11 +1277,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #fefefe; - -GtkNotebook-initial-gap: 10; + background-color: #ffffff; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1297,9 +1297,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #fafafb; } + background-color: #F5F6F7; } .notebook.header.frame { - border: 1px solid #dcdfe3; } + border: 0px solid #dcdfe3; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1309,13 +1309,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #eaecee; } + box-shadow: inset 0 -1px #dcdfe3; } .notebook.header.bottom { - box-shadow: inset 0 1px #eaecee; } + box-shadow: inset 0 1px #dcdfe3; } .notebook.header.right { - box-shadow: inset 1px 0 #eaecee; } + box-shadow: inset 1px 0 #dcdfe3; } .notebook.header.left { - box-shadow: inset -1px 0 #eaecee; } + box-shadow: inset -1px 0 #dcdfe3; } .notebook tab { border-width: 0; border-style: solid; @@ -1324,68 +1324,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(92, 97, 108, 0.55); } @@ -2379,21 +2375,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(207, 218, 231, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(207, 218, 231, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #2f343b; - border-color: #1f2227; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #32383f; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2431,7 +2439,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #ffffff; } .nautilus-circular-button { border-radius: 50%; @@ -2906,7 +2915,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #1f2227, inset 0 -1px #eaecee; } + box-shadow: inset 0 1px #1f2227, inset 0 -1px #dcdfe3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 9dfda59..06290ec 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -1276,11 +1276,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #fefefe; - -GtkNotebook-initial-gap: 10; + background-color: #ffffff; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1296,9 +1296,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #fafafb; } + background-color: #F5F6F7; } .notebook.header.frame { - border: 1px solid #dcdfe3; } + border: 0px solid #dcdfe3; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1308,13 +1308,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #eaecee; } + box-shadow: inset 0 -1px #dcdfe3; } .notebook.header.bottom { - box-shadow: inset 0 1px #eaecee; } + box-shadow: inset 0 1px #dcdfe3; } .notebook.header.right { - box-shadow: inset 1px 0 #eaecee; } + box-shadow: inset 1px 0 #dcdfe3; } .notebook.header.left { - box-shadow: inset -1px 0 #eaecee; } + box-shadow: inset -1px 0 #dcdfe3; } .notebook tab { border-width: 0; border-style: solid; @@ -1323,68 +1323,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(92, 97, 108, 0.55); } @@ -2378,21 +2374,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(82, 93, 118, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(82, 93, 118, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #e7e8eb; - border-color: #d4d5db; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #eff0f2; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2430,7 +2438,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #ffffff; } .nautilus-circular-button { border-radius: 50%; @@ -2905,7 +2914,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; } + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index d9711bc..213ba89 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -1276,11 +1276,11 @@ column-header .button, column-header .button:hover, column-header .button:active *****************/ .notebook { padding: 0; - background-color: #fefefe; - -GtkNotebook-initial-gap: 10; + background-color: #ffffff; + -GtkNotebook-initial-gap: 4; -GtkNotebook-arrow-spacing: 5; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: -8; + -GtkNotebook-tab-overlap: 1; -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; @@ -1296,9 +1296,9 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.frame.left { border-left-width: 0; } .notebook.header { - background-color: #fafafb; } + background-color: #F5F6F7; } .notebook.header.frame { - border: 1px solid #dcdfe3; } + border: 0px solid #dcdfe3; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1308,13 +1308,13 @@ column-header .button, column-header .button:hover, column-header .button:active .notebook.header.frame.left { border-right-width: 0; } .notebook.header.top { - box-shadow: inset 0 -1px #eaecee; } + box-shadow: inset 0 -1px #dcdfe3; } .notebook.header.bottom { - box-shadow: inset 0 1px #eaecee; } + box-shadow: inset 0 1px #dcdfe3; } .notebook.header.right { - box-shadow: inset 1px 0 #eaecee; } + box-shadow: inset 1px 0 #dcdfe3; } .notebook.header.left { - box-shadow: inset -1px 0 #eaecee; } + box-shadow: inset -1px 0 #dcdfe3; } .notebook tab { border-width: 0; border-style: solid; @@ -1323,68 +1323,64 @@ column-header .button, column-header .button:hover, column-header .button:active outline-color: transparent; outline-offset: 0; } .notebook tab.top, .notebook tab.bottom { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.left, .notebook tab.right { - padding: 5px 20px; } + padding: 4px 15px; } .notebook tab.reorderable-page.top, .notebook tab.reorderable-page.bottom { padding-left: 12px; padding-right: 12px; } .notebook tab.reorderable-page.top, .notebook tab.top { - border-color: transparent; } + padding-top: 6px; + border-radius: 3.5px 2px 0 0; + border-width: 0; + border-top-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page, .notebook tab.top:hover, .notebook tab.top.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-top-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.top:active, .notebook tab.top.active-page, .notebook tab.top.active-page:hover { - border-width: 1px; - border-top-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #ffffff, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom, .notebook tab.bottom { - border-color: transparent; } + padding-bottom: 6px; + border-radius: 0 0 2px 3.5px; + border-width: 0; + border-bottom-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-bottom-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.bottom:active, .notebook tab.bottom.active-page, .notebook tab.bottom.active-page:hover { - border-width: 1px; - border-bottom-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 -1px #ffffff, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right, .notebook tab.right { - border-color: transparent; } + padding-right: 17px; + border-radius: 0 3.5px 3.5px 0; + border-width: 0; + border-right-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-right-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.right:active, .notebook tab.right.active-page, .notebook tab.right.active-page:hover { - border-width: 1px; - border-right-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #ffffff, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left, .notebook tab.left { - border-color: transparent; } + padding-left: 17px; + border-radius: 3.5px 0 0 3.5px; + border-width: 0; + border-left-width: 2px; + border-color: transparent; + background-color: rgba(255, 255, 255, 0); } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page { - border-color: rgba(220, 223, 227, 0.5); - border-width: 1px; - border-left-width: 0; - background-color: rgba(245, 246, 247, 0.2); } + background-color: rgba(255, 255, 255, 0.5); + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #dcdfe3; } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.left:active, .notebook tab.left.active-page, .notebook tab.left.active-page:hover { - border-width: 1px; - border-left-width: 0; - border-color: #dcdfe3; - background-color: rgba(0, 0, 0, 0.035); } - .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover { - background-color: rgba(0, 0, 0, 0.035); } + background-color: #ffffff; + box-shadow: inset 0 1px #dcdfe3, inset 0 -1px #dcdfe3, inset 1px 0 #dcdfe3, inset -1px 0 #ffffff; } .notebook tab GtkLabel { padding: 0 2px; color: rgba(92, 97, 108, 0.55); } @@ -2378,21 +2374,33 @@ SushiFontWidget { TerminalWindow .background { background-color: transparent; } -TerminalWindow .notebook tab.reorderable-page, -TerminalWindow .notebook tab.reorderable-page:hover { - padding-top: 4px; - padding-bottom: 4px; } -TerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; } -TerminalWindow .notebook tab .active-page GtkLabel { - color: rgba(82, 93, 118, 0.8); } - TerminalWindow .notebook tab .active-page GtkLabel:backdrop { - color: rgba(82, 93, 118, 0.5); } -TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebook tab.reorderable-page.top:active:hover { - background-color: #e7e8eb; - border-color: #d4d5db; } - TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop { - background-color: #eff0f2; } +TerminalWindow .notebook { + /* tab { + &.reorderable-page.top, &.top { + border-width: 1px; + border-color: transparent; + box-shadow: none; + &:hover, &.prelight-page { + border-color: transparentize($borders_color, 0.5); + border-width: 1px; + border-top-width: 0; + background-color: transparentize($bg_color,0.8); + box-shadow: none; + } + &:active, &.active-page, &.active-page:hover { + border-width: 1px; + border-top-width: 0; + border-color: $header_border; + background-color: opacify($header_bg, 1); + box-shadow: none; + + &:backdrop { background-color: opacify($header_bg_backdrop, 1); } + } + } + } + */ } + TerminalWindow .notebook.header.top { + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; } TerminalWindow .scrollbar.vertical .slider { margin-left: 3px; } TerminalWindow .scrollbar.trough { @@ -2430,7 +2438,8 @@ NautilusNotebook.notebook { NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline-toolbar { padding: 5px; - box-shadow: none; } + box-shadow: none; + background-color: #ffffff; } .nautilus-circular-button { border-radius: 50%; @@ -2905,7 +2914,7 @@ WingpanelWidgetsIndicatorPopover.popover { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px #d4d5db, inset 0 -1px #eaecee; } + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #dcdfe3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { |
