From fb1f01082524dc6bb5994cbdc2c77e8473e6efd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 16 Sep 2015 17:14:23 +0200 Subject: [PATCH] Update style from sass --- data/gnome-classic.css | 108 +++++++++++++++++++++++++++++------------ data/gnome-shell-sass | 2 +- 2 files changed, 77 insertions(+), 33 deletions(-) diff --git a/data/gnome-classic.css b/data/gnome-classic.css index a9b36ffa..78a03588 100644 --- a/data/gnome-classic.css +++ b/data/gnome-classic.css @@ -38,14 +38,13 @@ stage { icon-shadow: 0 1px black; } .button:focus { color: #eeeeec; - border-color: #4a90d9; - box-shadow: inset 0 1px #454f52; text-shadow: 0 1px black; - icon-shadow: 0 1px black; } + icon-shadow: 0 1px black; + box-shadow: inset 0px 0px 0px 1px #4a90d9; } .button:insensitive { - color: #8d9091; + color: #8e9192; border-color: rgba(0, 0, 0, 0.7); - background-color: rgba(65, 70, 72, 0.7); + background-color: rgba(65, 71, 72, 0.7); box-shadow: none; text-shadow: none; icon-shadow: none; } @@ -53,9 +52,46 @@ stage { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: #222728; + box-shadow: inset 0 0 black; + text-shadow: none; + icon-shadow: none; } + +.modal-dialog-linked-button { + border-right-width: 1px; + color: #eeeeec; + background-color: #2e3436; + border-color: rgba(0, 0, 0, 0.7); + box-shadow: inset 0 1px #454f52; + text-shadow: 0 1px black; + icon-shadow: 0 1px black; + padding: 12px; } + .modal-dialog-linked-button:insensitive { + color: #8e9192; + border-color: rgba(0, 0, 0, 0.7); + background-color: rgba(65, 71, 72, 0.7); box-shadow: none; text-shadow: none; icon-shadow: none; } + .modal-dialog-linked-button:active { + color: white; + border-color: rgba(0, 0, 0, 0.7); + background-color: #222728; + box-shadow: inset 0 0 black; + text-shadow: none; + icon-shadow: none; } + .modal-dialog-linked-button:focus { + color: #eeeeec; + text-shadow: 0 1px black; + icon-shadow: 0 1px black; + box-shadow: inset 0px 0px 0px 1px #4a90d9; } + .modal-dialog-linked-button:first-child { + border-radius: 0px 0px 0px 6px; } + .modal-dialog-linked-button:last-child { + border-right-width: 0px; + border-radius: 0px 0px 6px 0px; } + .modal-dialog-linked-button:first-child:last-child { + border-right-width: 0px; + border-radius: 0px 0px 6px 6px; } /* Entries */ StEntry { @@ -72,7 +108,7 @@ StEntry { box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.4); border-color: rgba(0, 0, 0, 0.5); } StEntry:insensitive { - color: #8d9091; + color: #8e9192; border-color: #f4f4f4; box-shadow: none; } StEntry StIcon.capslock-warning { @@ -99,7 +135,7 @@ StScrollBar { background-color: #7a7e7f; margin: 3px; } StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover { - background-color: #54595a; } + background-color: #54595b; } StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #4a90d9; } @@ -161,11 +197,12 @@ StScrollBar { background-color: white; } .modal-dialog { - border-radius: 5px; + border-radius: 9px; color: #eeeeec; background-color: rgba(23, 25, 26, 0.95); - border: 3px solid rgba(238, 238, 236, 0.5); - padding: 24px; } + border: 3px solid rgba(238, 238, 236, 0.5); } + .modal-dialog .modal-dialog-content-box { + padding: 24px; } .modal-dialog .run-dialog-entry { width: 20em; margin-bottom: 6px; } @@ -180,10 +217,6 @@ StScrollBar { color: #d6d6d1; padding-bottom: .4em; } -.button-dialog-button-box { - spacing: 18px; - padding-top: 48px; } - .show-processes-dialog-subject, .mount-question-dialog-subject, .end-session-dialog-subject { @@ -412,7 +445,7 @@ StScrollBar { .popup-menu-ornament { text-align: right; - width: 1em; } + width: 1.2em; } .popup-menu-boxpointer, .candidate-popup-boxpointer { @@ -703,7 +736,7 @@ StScrollBar { border-left-width: 1px; } .calendar-nonwork-day { - color: #8d9091; } + color: #8e9192; } .calendar-today { font-weight: bold; @@ -755,7 +788,12 @@ StScrollBar { padding: 8px 8px 8px 0px; } .message-icon-bin > StIcon { - icon-size: 48px; } + icon-size: 32px; } + +.message-secondary-bin:ltr { + padding-left: 8px; } +.message-secondary-bin:rtl { + padding-right: 8px; } .message-secondary-bin { color: black; } @@ -764,14 +802,20 @@ StScrollBar { icon-size: 16px; } .message-title { - font-weight: bold; } + font-weight: bold; + font-size: 1.1em; } .message-content { - padding: 8px; } + padding: 8px; + font-size: .9em; } -.system-switch-user-submenu-icon { - icon-size: 24px; - border: 1px solid rgba(46, 52, 54, 0.4); } +.system-switch-user-submenu-icon.user-icon { + icon-size: 20px; + padding: 0 2px; } + +.system-switch-user-submenu-icon.default-icon { + icon-size: 16px; + padding: 0 4px; } #appMenu { spinner-image: url("resource:///org/gnome/shell/theme/process-working.svg"); @@ -780,7 +824,7 @@ StScrollBar { color: transparent; } .aggregate-menu { - width: 360px; } + width: 280px; } .aggregate-menu .popup-menu-icon { padding: 0 4px; } @@ -835,7 +879,8 @@ StScrollBar { min-width: 470px; } .nm-dialog-content { - spacing: 20px; } + spacing: 20px; + padding: 24px; } .nm-dialog-header-hbox { spacing: 10px; } @@ -1017,7 +1062,7 @@ StScrollBar { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: #222728; - box-shadow: none; + box-shadow: inset 0 0 black; text-shadow: none; icon-shadow: none; } .app-view-control:first-child { @@ -1336,10 +1381,9 @@ StScrollBar { color: white; } .keyboard-key:focus { color: #eeeeec; - border-color: #4a90d9; - box-shadow: inset 0 1px #454f52; text-shadow: 0 1px black; - icon-shadow: 0 1px black; } + icon-shadow: 0 1px black; + box-shadow: inset 0px 0px 0px 1px #4a90d9; } .keyboard-key:hover, .keyboard-key:checked { color: white; border-color: rgba(0, 0, 0, 0.7); @@ -1351,7 +1395,7 @@ StScrollBar { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: #222728; - box-shadow: none; + box-shadow: inset 0 0 black; text-shadow: none; icon-shadow: none; } .keyboard-key:grayed { @@ -1444,13 +1488,13 @@ StScrollBar { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: #3583d5; - box-shadow: none; + box-shadow: inset 0 0 black; text-shadow: none; icon-shadow: none; } .login-dialog .modal-dialog-button:default:insensitive { - color: #8d9091; + color: #8e9192; border-color: rgba(0, 0, 0, 0.7); - background-color: rgba(65, 70, 72, 0.7); + background-color: rgba(65, 71, 72, 0.7); box-shadow: none; text-shadow: none; icon-shadow: none; } diff --git a/data/gnome-shell-sass b/data/gnome-shell-sass index f0a0d1d3..034d0b77 160000 --- a/data/gnome-shell-sass +++ b/data/gnome-shell-sass @@ -1 +1 @@ -Subproject commit f0a0d1d3537912f41fef5aaa18b36cbd80b9b64f +Subproject commit 034d0b775b12f2212ba2028b153e4c2f31e6fa65