diff --git a/src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css b/src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css index 6dd2c63c..5d532772 100644 --- a/src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css +++ b/src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css @@ -123,7 +123,7 @@ StScrollBar StButton#vhandle:hover { .notification-button:focus:hover, .notification-icon-button:focus:hover, -.modal-dialog-button:focus:hover { +.dialog-button:focus:hover { border-image: url("button-assets/button-focus-hover.png") 4; } @@ -146,19 +146,19 @@ StScrollBar StButton#vhandle:hover { min-width: 100px; } -.menu.top { +.menu.menu-top { border-radius: 0 0 4px 4px; } -.menu.bottom { +.menu.menu-bottom { border-radius: 4px 4px 0 0; } -.menu.left { +.menu.menu-left { border-radius: 0 4px 4px 0; } -.menu.right { +.menu.menu-right { border-radius: 4px 0 0 4px; } @@ -1111,54 +1111,67 @@ StScrollBar StButton#vhandle:hover { } /* =================================================================== - * Modal dialogs (modalDialog.js) + * dialogs (dialog.js) * ===================================================================*/ -.modal-dialog { +.dialog { border-image: url("background-assets/bg-1.png") 6; color: rgb(70, 70, 70); padding: 20px; } -.modal-dialog-button-box { - spacing: 110px; - padding-top: 20px; +.dialog-button-box { } -.modal-dialog-button { +.dialog-button { height: 22px; color: rgb(70, 70, 70); border-image: url("button-assets/button.png") 4; padding: 3px 31px 4px; } -.modal-dialog-button:hover { +.dialog-button:hover { border-image: url("button-assets/button-hover.png") 4; } -.modal-dialog-button:focus { +.dialog-button:focus { border-image: url("button-assets/button-focus.png") 4; padding: 3px 31px 4px; } -.modal-dialog-button:active, -.modal-dialog-button:checked { +.dialog-button:active, +.dialog-button:checked { border-image: url("button-assets/button-pressed.png") 4; } -.modal-dialog-button:focus:hover { +.dialog-button:focus:hover { border-image: url("button-assets/button-focus-hover.png") 4; padding: 3px 31px 4px; } -.modal-dialog-button:focus:checked, -.modal-dialog-button:focus:active { +.dialog-button:focus:checked, +.dialog-button:focus:active { border-image: url("button-assets/button-pressed.png") 4; } -.modal-dialog-button:disabled { +.dialog-button:disabled { color: #a6a6a6; } +.dialog-button:destructive-action { + color: #c21616; +} + +.dialog-list .dialog-list-title { + padding: 1.3em; + text-align: center; + color: rgb(70, 70, 70); +} + +.dialog-list-item .dialog-list-item-description { + color: rgb(70, 70, 70); +} + + /* ============================================================================= * CinnamonMountOperation Dialogs (cinnamonMountOperation.js) * ============================================================================= */ @@ -1309,50 +1322,54 @@ StScrollBar StButton#vhandle:hover { * Policykit authentication dialog * ===================================================================*/ -.polkit-dialog { +.prompt-dialog { /* this is the width of the entire modal popup */ width: 500px; } -.polkit-dialog-main-layout { +.polkit-dialog-user-layout { spacing: 10px; } -.polkit-dialog-headline { - text-align: center; - font-size: 1.3em; - font-weight: bold; - color: rgb(70, 70, 70); +.polkit-dialog-user-layout:rtl { + padding-right: 10px; } -.polkit-dialog-description { - text-align: center; - font-size: 1em; +.polkit-dialog-user-combo { + border-image: url("button-assets/button.png") 4; + padding: 0.5em 2em; color: rgb(70, 70, 70); } -.polkit-dialog-user-layout { - spacing: 10px; +.polkit-dialog-user-combo:hover { + border-image: url("button-assets/button-hover.png") 4; } -.polkit-dialog-user-layout:rtl { - padding-right: 10px; +.polkit-dialog-user-combo:focus { + border-image: url("button-assets/button-focus.png") 4; } -.polkit-dialog-user-root-label { - color: #ff0000; +.polkit-dialog-user-combo:active, +.polkit-dialog-user-combo:checked { + border-image: url("button-assets/button-pressed.png") 4; } -.polkit-dialog-password-label:ltr { - padding-top: 0.5em; - padding-right: 0.5em; +.polkit-dialog-user-combo:focus:hover { + border-image: url("button-assets/button-focus-hover.png") 4; + padding: 3px 31px 4px; } -.polkit-dialog-password-label:rtl { - padding-left: 0.5em; +.polkit-dialog-user-combo:focus:checked, +.polkit-dialog-user-combo:active { + border-image: url("button-assets/button-pressed.png") 4; } -.polkit-dialog-password-entry { +.polkit-dialog-user-combo:disabled, +.polkit-dialog-user-combo:insensitive { + color: #a6a6a6; +} + +.prompt-dialog-password-entry { padding: 4px 12px; color: #2b2b2b; border-image: url("misc-assets/entry.png") 6; @@ -1360,19 +1377,17 @@ StScrollBar StButton#vhandle:hover { caret-color: #2b2b2b; caret-size: 1px; width: 250px; - height: 16px; transition-duration: 300; selected-color: #fff; selection-background-color: #accd8a; } -.polkit-dialog-password-entry:focus { +.prompt-dialog-password-entry:focus { padding: 4px 12px; color: #2b2b2b; border-image: url("misc-assets/entry-focus.png") 6; border-radius: 4px; width: 250px; - height: 16px; selected-color: #fff; caret-color: #2b2b2b; caret-size: 1px; @@ -1380,22 +1395,91 @@ StScrollBar StButton#vhandle:hover { transition-duration: 150; } -.polkit-dialog-password-entry .capslock-warning { +.prompt-dialog-password-entry .capslock-warning { icon-size: 16px; warning-color: rgb(64, 64, 64); padding: 0 4px; } -.polkit-dialog-error-label { +.prompt-dialog-error-label { text-align: center; font-size: 1em; color: #ff0000; } -.polkit-dialog-info-label { +.prompt-dialog-info-label { font-size: 1em; } +.prompt-dialog-password-entry StLabel.hint-text { + color: rgba(70, 70, 70, 0.4); +} + +.prompt-dialog-password-entry StIcon.peek-password { + icon-size: 16px; + color: rgb(70, 70, 70); +} + +/* =================================================================== + * Run dialog + * ===================================================================*/ + +.run-dialog-description { + text-align: center; + color: rgb(70, 70, 70); +} + +.run-dialog-entry { + padding: 4px 12px; + color: #2b2b2b; + border-image: url("misc-assets/entry.png") 6; + border-radius: 4px; + width: 250px; + min-height: 16px; + selected-color: #fff; + caret-color: #2b2b2b; + caret-size: 1px; + selection-background-color: #accd8a; + transition-duration: 150; +} + +.run-dialog-entry:focus { + padding: 4px 12px; + color: #2b2b2b; + border-image: url("misc-assets/entry-focus.png") 6; + border-radius: 4px; + width: 250px; + min-height: 16px; + selected-color: #fff; + caret-color: #2b2b2b; + caret-size: 1px; + selection-background-color: #accd8a; + transition-duration: 150; +} + +/* ################################################################### + * Audio device selection dialog + * ###################################################################*/ + +.audio-device-selection-dialog .audio-selection-box .audio-selection-device { + border-image: url("button-assets/button.png") 4; + color: rgb(70, 70, 70); +} +.audio-device-selection-dialog .audio-selection-box .audio-selection-device:focus { + border-image: url("button-assets/button-focus.png") 4; +} +.audio-device-selection-dialog .audio-selection-box .audio-selection-device:hover { + border-image: url("button-assets/button-hover.png") 4; +} +.audio-device-selection-dialog .audio-selection-box .audio-selection-device:insensitive { + color: #a6a6a6 +} +.audio-device-selection-dialog .audio-selection-box .audio-selection-device:selected, +.audio-device-selection-dialog .audio-selection-box .audio-selection-device:active, +.audio-device-selection-dialog .audio-selection-box .audio-selection-device:checked { + border-image: url("button-assets/button-pressed.png") 4; +} + /* ################################################################### * Cinnamon Specific Section * ###################################################################*/ @@ -1538,6 +1622,9 @@ StScrollBar StButton#vhandle:hover { .menu-context-menu { } +#menu-search-entry StLabel.hint-text { + color: rgba(70, 70, 70, 0.3); +} /* =================================================================== * Window list applet (window-list@cinnamon.org/applet.js) * ===================================================================*/ @@ -2166,14 +2253,18 @@ StScrollBar StButton#vhandle:hover { } .check-box StBin, -.check-box:focus StBin { +.check-box:focus StBin, +.check-box-2 StBin, +.check-box-2:focus StBin { width: 16px; height: 16px; background-image: url("control-assets/checkbox-unchecked.png"); } .check-box:checked StBin, -.check-box:focus:checked StBin { +.check-box:focus:checked StBin, +.check-box-2:checked StBin, +.check-box-2:focus:checked StBin { background-image: url("control-assets/checkbox-checked.png"); } @@ -2246,20 +2337,24 @@ StScrollBar StButton#vhandle:hover { font-size: 4em; } -.osd-window { +.media-keys-osd { border-image: url("background-assets/bg-1.png") 6; color: rgb(70, 70, 70); + margin-bottom: 1em; padding: 20px; spacing: 1em; } -.osd-window .level { - height: 0.7em; +.media-keys-osd .level { + min-width: 160px; + -barlevel-height: 0.7em; + -barlevel-background-color: rgba(70, 70, 70, 0.4); + -barlevel-active-background-color: rgb(172, 205, 138); + -barlevel-amplify-color: rgb(172, 205, 138); border-radius: 0.3em; - background-color: rgba(70, 70, 70, 0.4); } -.osd-window .level-bar { +.media-keys-osd .level-bar { border-radius: 0.3em; background-color: rgb(172, 205, 138); }