Move entries to spearate sheet, also better fix for lunakurame#19

andrew-ls · Jul 7, 2019 · 761c91d · 761c91d
1 parent 6427bc0
commit 761c91d
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 60 deletions.
diff --git a/theme/gnome-theme.css b/theme/gnome-theme.css
@@ -1,5 +1,6 @@
 @import "parts/toolbox.css";
 @import "parts/buttons.css";
+@import "parts/entries.css";
 @import "parts/headerbar.css";
 @import "parts/csd.css";
 @import "parts/popups.css";
@@ -39,40 +40,6 @@
 #sidebar-header {
 	padding: 6px !important;
 }
-
-/* Entries */
-#search-box, .findbar-textbox {
-	-moz-appearance: none !important;
-	background: var(--gnome-urlbar-background) !important;
-	border: 1px solid var(--gnome-urlbar-border-color) !important;
-	border-radius: 5px !important;
-	box-shadow: var(--gnome-urlbar-box-shadow) !important;
-	color: var(--gnome-urlbar-color) !important;
-	height: 34px;
-	margin: 0 3px !important;
-	padding: 6px 8px !important;
-}
-
-/* Entries focused */
-#search-box[focused], .findbar-textbox[focused] {
-	outline: 2px solid var(--gnome-focused-urlbar-border-color) !important;
-	outline-offset: -2px;
-	-moz-outline-radius: 5px;
-}
-
-/* Entries combined */
-.findbar-textbox {
-	border-top-right-radius: 0 !important;
-	border-bottom-right-radius: 0 !important;
-	border-right-width: 0 !important;
-	margin: 0 !important;
-}
-.findbar-textbox[focused] {
-	-moz-outline-radius: 5px 0 0 5px !important;
-}
-
-#search-box .textbox-search-sign {
-
 #sidebar-search-container {
 	padding: 6px !important;
 }

diff --git a/theme/parts/entries.css b/theme/parts/entries.css
@@ -0,0 +1,54 @@
+/* Entries */
+
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+/* Entries */
+#urlbar,
+#search-box,
+.findbar-textbox {
+	-moz-appearance: none !important;
+	background: var(--gnome-urlbar-background) !important;
+	border: 1px solid var(--gnome-urlbar-border-color) !important;
+	border-radius: 5px !important;
+	box-shadow: var(--gnome-urlbar-box-shadow) !important;
+	color: var(--gnome-urlbar-color) !important;
+	height: 34px !important;	
+	margin: 0 !important;
+	padding: 6px 8px !important;
+	box-sizing: border-box;
+}
+
+/* Entries focused */
+#urlbar[focused],
+#search-box[focused], 
+.findbar-textbox[focused],
+.findbar-textbox:focus {
+	outline: 2px solid var(--gnome-focused-urlbar-border-color) !important;
+	outline-offset: -2px;
+	-moz-outline-radius: 5px;
+}
+
+/* Inactive window entries */
+#urlbar:-moz-window-inactive,
+#search-box:-moz-window-inactive,
+.findbar-textbox:-moz-window-inactive {
+	background: var(--gnome-inactive-urlbar-background) !important;
+	border-color: var(--gnome-inactive-urlbar-border-color) !important;
+	box-shadow: var(--gnome-inactive-urlbar-box-shadow) !important;
+	color: var(--gnome-inactive-urlbar-color) !important;
+}
+
+/* Entries combined */
+.findbar-textbox {
+	border-top-right-radius: 0 !important;
+	border-bottom-right-radius: 0 !important;
+	border-right-width: 0 !important;
+}
+.findbar-textbox[focused], .findbar-textbox:focus {
+	-moz-outline-radius: 5px 0 0 5px !important;
+}
+
+#search-box .textbox-search-sign {
+
+}
+
diff --git a/theme/parts/headerbar-urlbar.css b/theme/parts/headerbar-urlbar.css
@@ -8,26 +8,11 @@ toolbarspring {
 }
 
 /* URL bar and Search bar */
-#urlbar,
-#searchbar > .searchbar-textbox {
-	background-image: var(--gnome-urlbar-background) !important;
-	border: 1px solid var(--gnome-urlbar-border-color) !important;
-	border-radius: 5px;
-	box-shadow: var(--gnome-urlbar-box-shadow) !important;
-	color: var(--gnome-urlbar-color) !important;
-	height: 34px;
+#urlbar {
 	margin: 0 3px !important;
+	padding: 0 !important;
 }
-/* Focused */
-#urlbar[focused],
-#searchbar > .searchbar-textbox[focused] {
-	border-width: 2px !important;
-	border-style: solid !important;
-	border-color: var(--gnome-focused-urlbar-border-color) !important;
-	outline: none;
-	outline-offset: -2px;
-	-moz-outline-radius: 3px;
-}
+
 #urlbar[focused] .urlbar-textbox-container {
 	margin: -1px !important;
 }
@@ -37,14 +22,6 @@ toolbarspring {
 #searchbar > .searchbar-textbox[focused] .search-go-button {
 	margin-right: -1px !important;
 }
-/* Inactive window */
-:root:-moz-window-inactive #urlbar,
-:root:-moz-window-inactive #searchbar > .searchbar-textbox {
-	background-image: var(--gnome-inactive-urlbar-background) !important;
-	border: 1px solid var(--gnome-inactive-urlbar-border-color) !important;
-	box-shadow: var(--gnome-inactive-urlbar-box-shadow) !important;
-	color: var(--gnome-inactive-urlbar-color) !important;
-}
 
 /* URL bar and Search bar's icons */
 .urlbar-icon:hover,