[gnome-builder] style: cleanup shared CSS



commit 83a829a9dae0eb0fd3b2571eb5ee0359054298c8
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jul 6 14:47:29 2017 -0700

    style: cleanup shared CSS
    
    This moves the editor styling into it's own shared css file.
    Hopefully that makes things a bit easier to maintain.

 data/themes/shared.css               |   76 +---------------------------------
 data/themes/shared/shared-editor.css |   65 +++++++++++++++++++++++++++++
 data/themes/shared/shared-layout.css |   72 +++++---------------------------
 libide/libide.gresource.xml          |    1 +
 4 files changed, 78 insertions(+), 136 deletions(-)
---
diff --git a/data/themes/shared.css b/data/themes/shared.css
index ccf7ca3..8695339 100644
--- a/data/themes/shared.css
+++ b/data/themes/shared.css
@@ -1,4 +1,5 @@
 @import url("resource:///org/gnome/builder/themes/shared/shared-layout.css");
+@import url("resource:///org/gnome/builder/themes/shared/shared-editor.css");
 
 /* work around some gtk padding issue */
 filechooser actionbar button.combo {
@@ -130,16 +131,6 @@ popover list row button:hover:not(.circular) {
 
 
 /*
- * Tweaks for the editortweak popover in the editor.
- */
-editortweak button {
-  padding: 0 6px 0 6px;
-}
-editortweak list row {
-  padding: 0;
-}
-
-/*
  * Styling in the genesis (create project) perspective.
  */
 genesisperspective stack > box:first-child list row {
@@ -167,28 +158,6 @@ greeter frame border {
 }
 
 /*
- * Global search results styling
- *
- * The following tweaks the sizing of listbox rows in the
- * global search results to have a bit more padding and
- * row separators after each line. Additionally, we tweak
- * the selection color to ensure it has priority.
- */
-omnisearchdisplay omnisearchgroup omnisearchrow {
-  background: transparent;
-  padding: 9px 12px 9px 12px;
-  border-bottom: 1px solid alpha(@borders, 0.2);
-}
-omnisearchdisplay omnisearchgroup omnisearchrow:last-child {
-  border-bottom: none;
-}
-omnisearchdisplay omnisearchgroup omnisearchrow:selected {
-  background-color: @theme_selected_bg_color;
-  color: @theme_selected_fg_color;
-}
-
-
-/*
  * Perspectives switcher
  *
  * The following tweaks the left-most sidebar containing
@@ -267,34 +236,6 @@ omnibar:active entry {
 }
 
 
-list.buildpanel row {
-  padding: 10px;
-  border-bottom: 1px solid alpha(@borders, 0.4);
-}
-
-list.buildpanel row:last-child {
-  border-bottom: none;
-}
-
-buildpanel list row {
-  padding: 6px;
-  border-bottom: 1px solid alpha(@borders, 0.4);
-}
-
-buildpanel list row:last-child {
-  border-bottom: none;
-}
-
-buildpanel list row label.file {
-  opacity: 0.5;
-}
-
-
-buildpanel box.build-status {
-  background: shade(@theme_bg_color, 0.96);
-}
-
-
 buildperspective list.sidebar row:selected button:hover {
   border-color: transparent;
   box-shadow: none;
@@ -338,19 +279,11 @@ configurationview list row button {
 
 
 /* hrmm, we can use this to get row separators */
-buildpanel treeview,
 configurationview treeview {
   border-bottom: 1px solid alpha(@borders, 0.4);
 }
 
 
-buildpanel list > label {
-  font-weight: bold;
-  opacity: 0.55;
-  margin: 6px 10px 0px 10px;
-}
-
-
 popover.transfers list {
   background-color: transparent;
 }
@@ -365,10 +298,3 @@ popover.transfers list row > box {
 }
 
 
-ideeditorsidebar label.error {
-  color: @error_color;
-  font-weight: bold;
-}
-ideeditorsidebar label.error:backdrop {
-  font-weight: normal;
-}
diff --git a/data/themes/shared/shared-editor.css b/data/themes/shared/shared-editor.css
new file mode 100644
index 0000000..aa8dc50
--- /dev/null
+++ b/data/themes/shared/shared-editor.css
@@ -0,0 +1,65 @@
+ideeditorsidebar > stackswitcher {
+  margin: 6px;
+}
+ideeditorsidebar .handle {
+ border: 1px solid alpha(@borders, 0.3);
+}
+ideeditorsidebar label.title {
+  margin: 8px 6px 3px 6px;
+  font-weight: bold;
+  font-size: 0.8em;
+}
+ideeditorsidebar dzlstacklist list row,
+ideeditorsidebar list.open-pages row {
+  padding: 1px 0;
+  color: @theme_fg_color;
+}
+ideeditorsidebar dzlstacklist list row:selected,
+ideeditorsidebar list.open-pages row:selected {
+  color: @theme_selected_fg_color;
+}
+ideeditorsidebar dzlstacklist list row:backdrop,
+ideeditorsidebar list.open-pages row:backdrop {
+  color: @theme_unfocused_fg_color;
+}
+ideeditorsidebar dzlstacklist list:not(.stack-header) row box > image:first-child,
+ideeditorsidebar list.open-pages row box > image:first-child {
+  opacity: 0.55;
+}
+ideeditorsidebar dzlstacklist row box > image:first-child,
+ideeditorsidebar list.open-pages row box > image:first-child {
+  margin: 6px 8px;
+  min-height: 16px;
+  min-width: 16px;
+}
+ideeditorsidebar dzlstacklist row box > button:last-child,
+ideeditorsidebar list.open-pages row box > button:last-child {
+  background: none;
+  box-shadow: none;
+  border: none;
+  outline: none;
+  padding: 0;
+  margin: 0 6px;
+  color: @theme_fg_color;
+  opacity: 0.55;
+}
+ideeditorsidebar dzlstacklist row box > button:last-child:hover,
+ideeditorsidebar list.open-pages row box > button:last-child:hover {
+  opacity: 1;
+}
+ideeditorsidebar dzlstacklist row box > button:last-child image,
+ideeditorsidebar list.open-pages row box > button:last-child image {
+  min-height: 16px;
+  min-width: 16px;
+}
+ideeditorsidebar dzlstacklist row box > button:last-child:backdrop,
+ideeditorsidebar list.open-pages row box > button:last-child:backdrop {
+  color: @theme_unfocused_fg_color;
+}
+ideeditorsidebar label.error {
+  color: @error_color;
+  font-weight: bold;
+}
+ideeditorsidebar label.error:backdrop {
+  font-weight: normal;
+}
diff --git a/data/themes/shared/shared-layout.css b/data/themes/shared/shared-layout.css
index 3b98aaa..33102c2 100644
--- a/data/themes/shared/shared-layout.css
+++ b/data/themes/shared/shared-layout.css
@@ -1,7 +1,6 @@
 idelayoutstackheader {
   min-height: 26px;
 }
-
 idelayoutstackheader button {
   border: none;
   border-radius: 0;
@@ -10,99 +9,56 @@ idelayoutstackheader button {
   padding: 0;
   margin: 0;
 }
-
 idelayoutstackheader button:not(:disabled) image {
   opacity: 0.55;
 }
-
 idelayoutstackheader button:checked image,
 idelayoutstackheader button:not(:disabled):hover image {
   opacity: 1;
 }
-
 idelayoutstackheader button:checked,
 idelayoutstackheader button:hover {
   background: shade(@theme_bg_color, 0.9);
 }
-
 idelayoutstackheader button:active {
   background: shade(@theme_bg_color, 0.85);
 }
-
 idelayoutstackheader > button {
   padding-left: 12px;
   padding-right: 12px;
 }
-
 idelayoutstackheader * button:first-child > image,
 idelayoutstackheader * button:last-child:dir(rtl) > image {
   padding-left: 12px;
   padding-right: 10px;
 }
-
 idelayoutstackheader * button:first-child:dir(rtl) > image,
 idelayoutstackheader * button:last-child > image {
   padding-right: 12px;
   padding-left: 9px;
 }
-
 idelayoutgridcolumn.handle,
 idelayoutgrid.handle {
   border: 1px solid @borders;
 }
-
-popover.title-popover scrolledwindow {
-  min-width: 300px;
-}
-
-popover.title-popover list {
-  background: transparent;
-}
-
-ideeditorsidebar > stackswitcher {
-  margin: 6px;
-}
-
-dzldockpaned ideeditorsidebar .handle {
- border: 1px solid alpha(@borders, 0.3);
-}
-
-ideeditorsidebar label.title {
-  margin: 8px 6px 3px 6px;
-  font-weight: bold;
-  font-size: 0.8em;
-}
-popover.title-popover list row {
+idelayoutgrid idelayoutstack popover.title-popover list row {
   padding: 1px 0;
 }
-ideeditorsidebar dzlstacklist list row,
-ideeditorsidebar list.open-pages row {
-  padding: 1px 0;
-  color: @theme_fg_color;
-}
-ideeditorsidebar dzlstacklist list row:selected,
-ideeditorsidebar list.open-pages row:selected {
-  color: @theme_selected_fg_color;
+idelayoutgrid idelayoutstack popover.title-popover scrolledwindow {
+  min-width: 300px;
 }
-ideeditorsidebar dzlstacklist list row:backdrop,
-ideeditorsidebar list.open-pages row:backdrop {
-  color: @theme_unfocused_fg_color;
+idelayoutgrid idelayoutstack popover.title-popover list {
+  background: transparent;
 }
-popover.title-popover list row box > image:first-child,
-ideeditorsidebar dzlstacklist list:not(.stack-header) row box > image:first-child,
-ideeditorsidebar list.open-pages row box > image:first-child {
+popover.title-popover list row box > image:first-child {
   opacity: 0.55;
 }
-popover.title-popover list row box > image:first-child,
-ideeditorsidebar dzlstacklist row box > image:first-child,
-ideeditorsidebar list.open-pages row box > image:first-child {
+popover.title-popover list row box > image:first-child {
   margin: 6px 8px;
   min-height: 16px;
   min-width: 16px;
 }
-popover.title-popover list row button:last-child,
-ideeditorsidebar dzlstacklist row box > button:last-child,
-ideeditorsidebar list.open-pages row box > button:last-child {
+popover.title-popover list row button:last-child {
   background: none;
   box-shadow: none;
   border: none;
@@ -112,19 +68,13 @@ ideeditorsidebar list.open-pages row box > button:last-child {
   color: @theme_fg_color;
   opacity: 0.55;
 }
-popover.title-popover list row button:last-child:hover,
-ideeditorsidebar dzlstacklist row box > button:last-child:hover,
-ideeditorsidebar list.open-pages row box > button:last-child:hover {
+popover.title-popover list row button:last-child:hover {
   opacity: 1;
 }
-popover.title-popover list row button image,
-ideeditorsidebar dzlstacklist row box > button:last-child image,
-ideeditorsidebar list.open-pages row box > button:last-child image {
+popover.title-popover list row button image {
   min-height: 16px;
   min-width: 16px;
 }
-popover.title-popover list row button image,
-ideeditorsidebar dzlstacklist row box > button:last-child:backdrop,
-ideeditorsidebar list.open-pages row box > button:last-child:backdrop {
+popover.title-popover list row button image {
   color: @theme_unfocused_fg_color;
 }
diff --git a/libide/libide.gresource.xml b/libide/libide.gresource.xml
index 26a1472..fb3f733 100644
--- a/libide/libide.gresource.xml
+++ b/libide/libide.gresource.xml
@@ -32,6 +32,7 @@
     <file compressed="true" alias="Arc-shared.css">../data/themes/Arc-shared.css</file>
 
     <file compressed="true" alias="shared.css">../data/themes/shared.css</file>
+    <file compressed="true" alias="shared/shared-editor.css">../data/themes/shared/shared-editor.css</file>
     <file compressed="true" alias="shared/shared-layout.css">../data/themes/shared/shared-layout.css</file>
   </gresource>
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]