diff --git a/README.md b/README.md index b942952..3cf4fa4 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,17 @@ If your distribution is not listed, please check the requirements yourself. rm -rf ~/.local/share/themes/Arc rm -rf ~/.themes/Arc +**Packages** + +Prebuilt packages for Ubuntu, Debian, Fedora and openSUSE are available at + +http://software.opensuse.org/download.html?project=home%3AHorst3180&package=arc-theme +**Note:** elementary OS Freya users can install the package for Ubuntu 15.04 + +Arch Linux users can install the theme from the AUR + +https://aur.archlinux.org/packages/gtk-theme-arc-git/ + **Manual Installation** To build the theme you need @@ -54,14 +65,6 @@ If you want to install the latest version from git, clone the repository with git clone https://github.com/horst3180/arc-theme --depth 1 && cd arc-theme -If you want to install the latest stable release, run - - git clone https://github.com/horst3180/arc-theme --depth 1 && cd arc-theme - git fetch --tags - git checkout $(git describe --tags `git rev-list --tags --max-count=1`) - -or download it from https://github.com/horst3180/arc-theme/releases and cd into the extracted archive - **2. Build and install the theme** ./autogen.sh --prefix=/usr diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss index 9a596e1..445ae06 100644 --- a/common/gtk-3.0/3.14/_common.scss +++ b/common/gtk-3.0/3.14/_common.scss @@ -241,7 +241,7 @@ GtkFlowBox .grid-child { } &.progressbar { - margin: 2px; + margin: 2px 12px; border-radius: 0; border-width: 0 0 2px; border-color: $selected_bg_color; @@ -1188,6 +1188,12 @@ GtkComboBox { background-color: $selected_fg_color; color: $selected_bg_color; } + + &.progressbar { + border-color: $selected_bg_color; + background-image: none; + background-color: transparent; + } } // Header-bar Buttons diff --git a/common/gtk-3.0/3.14/_transparent_widgets.scss b/common/gtk-3.0/3.14/_transparent_widgets.scss index 8b4b953..2d4de65 100644 --- a/common/gtk-3.0/3.14/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/_transparent_widgets.scss @@ -23,10 +23,10 @@ MarlinViewWindow { GtkBox.sidebar { background-color: transparent; } - .sidebar, .source-list.sidebar.view { + .sidebar, MarlinPlacesSidebar { background-color: $dark_sidebar_bg; - .view, row { + .view, .source-list.sidebar row { background-color: transparent; color: $dark_sidebar_fg; @@ -38,7 +38,6 @@ MarlinViewWindow { } } - &.frame { color: $dark_sidebar_fg; } 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 1a77432..0eb9895 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -169,7 +169,7 @@ GtkFlowBox .grid-child { background-color: #5294E2; color: #ffffff; } .entry.progressbar { - margin: 2px; + margin: 2px 12px; border-radius: 0; border-width: 0 0 2px; border-color: #5294E2; @@ -899,6 +899,10 @@ GtkComboBox { .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } + .primary-toolbar .entry.progressbar, .header-bar .entry.progressbar { + border-color: #5294E2; + background-image: none; + background-color: transparent; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); outline-color: rgba(82, 93, 118, 0.1); @@ -3067,135 +3071,141 @@ NautilusWindow GtkBox.sidebar, NemoWindow GtkBox.sidebar, MarlinViewWindow GtkBox.sidebar { background-color: transparent; } -GtkFileChooserDialog .sidebar, GtkFileChooserDialog .source-list.sidebar.view, +GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, NautilusWindow .sidebar, -NautilusWindow .source-list.sidebar.view, +NautilusWindow MarlinPlacesSidebar, NemoWindow .sidebar, -NemoWindow .source-list.sidebar.view, +NemoWindow MarlinPlacesSidebar, MarlinViewWindow .sidebar, -MarlinViewWindow .source-list.sidebar.view { +MarlinViewWindow MarlinPlacesSidebar { background-color: #3c4049; } - GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, GtkFileChooserDialog .source-list.sidebar.view row, + GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, NautilusWindow .sidebar .view, - NautilusWindow .sidebar row, - NautilusWindow .source-list.sidebar.view .view, - NautilusWindow .source-list.sidebar.view row, + NautilusWindow .sidebar .source-list.sidebar row, + NautilusWindow MarlinPlacesSidebar .view, + NautilusWindow MarlinPlacesSidebar .source-list.sidebar row, NemoWindow .sidebar .view, - NemoWindow .sidebar row, - NemoWindow .source-list.sidebar.view .view, - NemoWindow .source-list.sidebar.view row, + NemoWindow .sidebar .source-list.sidebar row, + NemoWindow MarlinPlacesSidebar .view, + NemoWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, - MarlinViewWindow .sidebar row, - MarlinViewWindow .source-list.sidebar.view .view, - MarlinViewWindow .source-list.sidebar.view row { + MarlinViewWindow .sidebar .source-list.sidebar row, + MarlinViewWindow MarlinPlacesSidebar .view, + MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row { background-color: transparent; color: #A8ADB5; } - GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar row.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, GtkFileChooserDialog .source-list.sidebar.view row.image, + GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, NautilusWindow .sidebar .view.image, - NautilusWindow .sidebar row.image, - NautilusWindow .source-list.sidebar.view .view.image, - NautilusWindow .source-list.sidebar.view row.image, + NautilusWindow .sidebar .source-list.sidebar row.image, + NautilusWindow MarlinPlacesSidebar .view.image, + NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image, NemoWindow .sidebar .view.image, - NemoWindow .sidebar row.image, - NemoWindow .source-list.sidebar.view .view.image, - NemoWindow .source-list.sidebar.view row.image, + NemoWindow .sidebar .source-list.sidebar row.image, + NemoWindow MarlinPlacesSidebar .view.image, + NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, - MarlinViewWindow .sidebar row.image, - MarlinViewWindow .source-list.sidebar.view .view.image, - MarlinViewWindow .source-list.sidebar.view row.image { + MarlinViewWindow .sidebar .source-list.sidebar row.image, + MarlinViewWindow MarlinPlacesSidebar .view.image, + MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image { color: rgba(168, 173, 181, 0.6); } - GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar row.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, GtkFileChooserDialog .source-list.sidebar.view row.cell:selected, + GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, NautilusWindow .sidebar .view.cell:selected, - NautilusWindow .sidebar row.cell:selected, - NautilusWindow .source-list.sidebar.view .view.cell:selected, - NautilusWindow .source-list.sidebar.view row.cell:selected, + NautilusWindow .sidebar .source-list.sidebar row.cell:selected, + NautilusWindow MarlinPlacesSidebar .view.cell:selected, + NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, NemoWindow .sidebar .view.cell:selected, - NemoWindow .sidebar row.cell:selected, - NemoWindow .source-list.sidebar.view .view.cell:selected, - NemoWindow .source-list.sidebar.view row.cell:selected, + NemoWindow .sidebar .source-list.sidebar row.cell:selected, + NemoWindow MarlinPlacesSidebar .view.cell:selected, + NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, MarlinViewWindow .sidebar .view.cell:selected, - MarlinViewWindow .sidebar row.cell:selected, - MarlinViewWindow .source-list.sidebar.view .view.cell:selected, - MarlinViewWindow .source-list.sidebar.view row.cell:selected { + MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, + MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, + MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } - GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog .source-list.sidebar.view.frame, + GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, NautilusWindow .sidebar.frame, - NautilusWindow .source-list.sidebar.view.frame, + NautilusWindow MarlinPlacesSidebar.frame, NemoWindow .sidebar.frame, - NemoWindow .source-list.sidebar.view.frame, + NemoWindow MarlinPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, - MarlinViewWindow .source-list.sidebar.view.frame { + MarlinViewWindow MarlinPlacesSidebar.frame { color: #A8ADB5; } - GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, + GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator, - NautilusWindow .source-list.sidebar.view .separator, + NautilusWindow MarlinPlacesSidebar .separator, + NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, + GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NemoWindow .sidebar .separator, NemoWindow GtkPlacesSidebar.sidebar .view.separator, - NemoWindow .source-list.sidebar.view .separator, + NemoWindow MarlinPlacesSidebar .separator, + NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, + GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, - MarlinViewWindow .source-list.sidebar.view .separator { + MarlinViewWindow MarlinPlacesSidebar .separator, + MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, + GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator { color: transparent; } - GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.trough, + GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, NautilusWindow .sidebar .scrollbar.trough, - NautilusWindow .source-list.sidebar.view .scrollbar.trough, + NautilusWindow MarlinPlacesSidebar .scrollbar.trough, NemoWindow .sidebar .scrollbar.trough, - NemoWindow .source-list.sidebar.view .scrollbar.trough, + NemoWindow MarlinPlacesSidebar .scrollbar.trough, MarlinViewWindow .sidebar .scrollbar.trough, - MarlinViewWindow .source-list.sidebar.view .scrollbar.trough { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough { background-color: transparent; border-color: transparent; } - GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider, + GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, NautilusWindow .sidebar .scrollbar.slider, - NautilusWindow .source-list.sidebar.view .scrollbar.slider, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider, NemoWindow .sidebar .scrollbar.slider, - NemoWindow .source-list.sidebar.view .scrollbar.slider, + NemoWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow .sidebar .scrollbar.slider, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; background-color: rgba(209, 212, 216, 0.7); } - GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider:hover, + GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, NautilusWindow .sidebar .scrollbar.slider:hover, - NautilusWindow .source-list.sidebar.view .scrollbar.slider:hover, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow .sidebar .scrollbar.slider:hover, - NemoWindow .source-list.sidebar.view .scrollbar.slider:hover, + NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider:hover { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover { background-color: #dfe1e4; } - GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider:prelight:active, + GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, NautilusWindow .sidebar .scrollbar.slider:prelight:active, - NautilusWindow .source-list.sidebar.view .scrollbar.slider:prelight:active, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, NemoWindow .sidebar .scrollbar.slider:prelight:active, - NemoWindow .source-list.sidebar.view .scrollbar.slider:prelight:active, + NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider:prelight:active { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active { background-color: #5294E2; } - GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider.fine-tune, + GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, NautilusWindow .sidebar .scrollbar.slider.fine-tune, - NautilusWindow .source-list.sidebar.view .scrollbar.slider.fine-tune, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, NemoWindow .sidebar .scrollbar.slider.fine-tune, - NemoWindow .source-list.sidebar.view .scrollbar.slider.fine-tune, + NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider.fine-tune { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune { border-width: 4px; } - GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider.fine-tune:prelight:active, + GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, - NautilusWindow .source-list.sidebar.view .scrollbar.slider.fine-tune:prelight:active, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, - NemoWindow .source-list.sidebar.view .scrollbar.slider.fine-tune:prelight:active, + NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider.fine-tune:prelight:active { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { background-color: #5294E2; } - GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider:insensitive, + GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, NautilusWindow .sidebar .scrollbar.slider:insensitive, - NautilusWindow .source-list.sidebar.view .scrollbar.slider:insensitive, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, NemoWindow .sidebar .scrollbar.slider:insensitive, - NemoWindow .source-list.sidebar.view .scrollbar.slider:insensitive, + NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, MarlinViewWindow .sidebar .scrollbar.slider:insensitive, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider:insensitive { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index a6d47ce..157ebb8 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -169,7 +169,7 @@ GtkFlowBox .grid-child { background-color: #5294E2; color: #ffffff; } .entry.progressbar { - margin: 2px; + margin: 2px 12px; border-radius: 0; border-width: 0 0 2px; border-color: #5294E2; @@ -899,6 +899,10 @@ GtkComboBox { .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } + .primary-toolbar .entry.progressbar, .header-bar .entry.progressbar { + border-color: #5294E2; + background-image: none; + background-color: transparent; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); outline-color: rgba(82, 93, 118, 0.1); @@ -3067,135 +3071,141 @@ NautilusWindow GtkBox.sidebar, NemoWindow GtkBox.sidebar, MarlinViewWindow GtkBox.sidebar { background-color: transparent; } -GtkFileChooserDialog .sidebar, GtkFileChooserDialog .source-list.sidebar.view, +GtkFileChooserDialog .sidebar, GtkFileChooserDialog MarlinPlacesSidebar, NautilusWindow .sidebar, -NautilusWindow .source-list.sidebar.view, +NautilusWindow MarlinPlacesSidebar, NemoWindow .sidebar, -NemoWindow .source-list.sidebar.view, +NemoWindow MarlinPlacesSidebar, MarlinViewWindow .sidebar, -MarlinViewWindow .source-list.sidebar.view { +MarlinViewWindow MarlinPlacesSidebar { background-color: rgba(60, 64, 73, 0.95); } - GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar row, GtkFileChooserDialog .source-list.sidebar.view .view, GtkFileChooserDialog .source-list.sidebar.view row, + GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .sidebar .source-list.sidebar row, GtkFileChooserDialog MarlinPlacesSidebar .view, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row, NautilusWindow .sidebar .view, - NautilusWindow .sidebar row, - NautilusWindow .source-list.sidebar.view .view, - NautilusWindow .source-list.sidebar.view row, + NautilusWindow .sidebar .source-list.sidebar row, + NautilusWindow MarlinPlacesSidebar .view, + NautilusWindow MarlinPlacesSidebar .source-list.sidebar row, NemoWindow .sidebar .view, - NemoWindow .sidebar row, - NemoWindow .source-list.sidebar.view .view, - NemoWindow .source-list.sidebar.view row, + NemoWindow .sidebar .source-list.sidebar row, + NemoWindow MarlinPlacesSidebar .view, + NemoWindow MarlinPlacesSidebar .source-list.sidebar row, MarlinViewWindow .sidebar .view, - MarlinViewWindow .sidebar row, - MarlinViewWindow .source-list.sidebar.view .view, - MarlinViewWindow .source-list.sidebar.view row { + MarlinViewWindow .sidebar .source-list.sidebar row, + MarlinViewWindow MarlinPlacesSidebar .view, + MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row { background-color: transparent; color: #A8ADB5; } - GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar row.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, GtkFileChooserDialog .source-list.sidebar.view row.image, + GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .sidebar .source-list.sidebar row.image, GtkFileChooserDialog MarlinPlacesSidebar .view.image, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.image, NautilusWindow .sidebar .view.image, - NautilusWindow .sidebar row.image, - NautilusWindow .source-list.sidebar.view .view.image, - NautilusWindow .source-list.sidebar.view row.image, + NautilusWindow .sidebar .source-list.sidebar row.image, + NautilusWindow MarlinPlacesSidebar .view.image, + NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.image, NemoWindow .sidebar .view.image, - NemoWindow .sidebar row.image, - NemoWindow .source-list.sidebar.view .view.image, - NemoWindow .source-list.sidebar.view row.image, + NemoWindow .sidebar .source-list.sidebar row.image, + NemoWindow MarlinPlacesSidebar .view.image, + NemoWindow MarlinPlacesSidebar .source-list.sidebar row.image, MarlinViewWindow .sidebar .view.image, - MarlinViewWindow .sidebar row.image, - MarlinViewWindow .source-list.sidebar.view .view.image, - MarlinViewWindow .source-list.sidebar.view row.image { + MarlinViewWindow .sidebar .source-list.sidebar row.image, + MarlinViewWindow MarlinPlacesSidebar .view.image, + MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.image { color: rgba(168, 173, 181, 0.6); } - GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar row.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, GtkFileChooserDialog .source-list.sidebar.view row.cell:selected, + GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .sidebar .source-list.sidebar row.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .view.cell:selected, GtkFileChooserDialog MarlinPlacesSidebar .source-list.sidebar row.cell:selected, NautilusWindow .sidebar .view.cell:selected, - NautilusWindow .sidebar row.cell:selected, - NautilusWindow .source-list.sidebar.view .view.cell:selected, - NautilusWindow .source-list.sidebar.view row.cell:selected, + NautilusWindow .sidebar .source-list.sidebar row.cell:selected, + NautilusWindow MarlinPlacesSidebar .view.cell:selected, + NautilusWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, NemoWindow .sidebar .view.cell:selected, - NemoWindow .sidebar row.cell:selected, - NemoWindow .source-list.sidebar.view .view.cell:selected, - NemoWindow .source-list.sidebar.view row.cell:selected, + NemoWindow .sidebar .source-list.sidebar row.cell:selected, + NemoWindow MarlinPlacesSidebar .view.cell:selected, + NemoWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected, MarlinViewWindow .sidebar .view.cell:selected, - MarlinViewWindow .sidebar row.cell:selected, - MarlinViewWindow .source-list.sidebar.view .view.cell:selected, - MarlinViewWindow .source-list.sidebar.view row.cell:selected { + MarlinViewWindow .sidebar .source-list.sidebar row.cell:selected, + MarlinViewWindow MarlinPlacesSidebar .view.cell:selected, + MarlinViewWindow MarlinPlacesSidebar .source-list.sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } - GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog .source-list.sidebar.view.frame, + GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog MarlinPlacesSidebar.frame, NautilusWindow .sidebar.frame, - NautilusWindow .source-list.sidebar.view.frame, + NautilusWindow MarlinPlacesSidebar.frame, NemoWindow .sidebar.frame, - NemoWindow .source-list.sidebar.view.frame, + NemoWindow MarlinPlacesSidebar.frame, MarlinViewWindow .sidebar.frame, - MarlinViewWindow .source-list.sidebar.view.frame { + MarlinViewWindow MarlinPlacesSidebar.frame { color: #A8ADB5; } - GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, + GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog MarlinPlacesSidebar .separator, GtkFileChooserDialog MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar GtkFileChooserDialog MarlinPlacesSidebar .view.separator, NautilusWindow .sidebar .separator, NautilusWindow GtkPlacesSidebar.sidebar .view.separator, - NautilusWindow .source-list.sidebar.view .separator, + NautilusWindow MarlinPlacesSidebar .separator, + NautilusWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, + GtkPlacesSidebar.sidebar NautilusWindow MarlinPlacesSidebar .view.separator, NemoWindow .sidebar .separator, NemoWindow GtkPlacesSidebar.sidebar .view.separator, - NemoWindow .source-list.sidebar.view .separator, + NemoWindow MarlinPlacesSidebar .separator, + NemoWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, + GtkPlacesSidebar.sidebar NemoWindow MarlinPlacesSidebar .view.separator, MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, - MarlinViewWindow .source-list.sidebar.view .separator { + MarlinViewWindow MarlinPlacesSidebar .separator, + MarlinViewWindow MarlinPlacesSidebar GtkPlacesSidebar.sidebar .view.separator, + GtkPlacesSidebar.sidebar MarlinViewWindow MarlinPlacesSidebar .view.separator { color: transparent; } - GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.trough, + GtkFileChooserDialog .sidebar .scrollbar.trough, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.trough, NautilusWindow .sidebar .scrollbar.trough, - NautilusWindow .source-list.sidebar.view .scrollbar.trough, + NautilusWindow MarlinPlacesSidebar .scrollbar.trough, NemoWindow .sidebar .scrollbar.trough, - NemoWindow .source-list.sidebar.view .scrollbar.trough, + NemoWindow MarlinPlacesSidebar .scrollbar.trough, MarlinViewWindow .sidebar .scrollbar.trough, - MarlinViewWindow .source-list.sidebar.view .scrollbar.trough { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.trough { background-color: transparent; border-color: transparent; } - GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider, + GtkFileChooserDialog .sidebar .scrollbar.slider, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider, NautilusWindow .sidebar .scrollbar.slider, - NautilusWindow .source-list.sidebar.view .scrollbar.slider, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider, NemoWindow .sidebar .scrollbar.slider, - NemoWindow .source-list.sidebar.view .scrollbar.slider, + NemoWindow MarlinPlacesSidebar .scrollbar.slider, MarlinViewWindow .sidebar .scrollbar.slider, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider { border-radius: 20px; border: 3px solid transparent; background-color: rgba(209, 212, 216, 0.7); } - GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider:hover, + GtkFileChooserDialog .sidebar .scrollbar.slider:hover, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:hover, NautilusWindow .sidebar .scrollbar.slider:hover, - NautilusWindow .source-list.sidebar.view .scrollbar.slider:hover, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider:hover, NemoWindow .sidebar .scrollbar.slider:hover, - NemoWindow .source-list.sidebar.view .scrollbar.slider:hover, + NemoWindow MarlinPlacesSidebar .scrollbar.slider:hover, MarlinViewWindow .sidebar .scrollbar.slider:hover, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider:hover { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:hover { background-color: #dfe1e4; } - GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider:prelight:active, + GtkFileChooserDialog .sidebar .scrollbar.slider:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:prelight:active, NautilusWindow .sidebar .scrollbar.slider:prelight:active, - NautilusWindow .source-list.sidebar.view .scrollbar.slider:prelight:active, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, NemoWindow .sidebar .scrollbar.slider:prelight:active, - NemoWindow .source-list.sidebar.view .scrollbar.slider:prelight:active, + NemoWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active, MarlinViewWindow .sidebar .scrollbar.slider:prelight:active, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider:prelight:active { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:prelight:active { background-color: #5294E2; } - GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider.fine-tune, + GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune, NautilusWindow .sidebar .scrollbar.slider.fine-tune, - NautilusWindow .source-list.sidebar.view .scrollbar.slider.fine-tune, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, NemoWindow .sidebar .scrollbar.slider.fine-tune, - NemoWindow .source-list.sidebar.view .scrollbar.slider.fine-tune, + NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune, MarlinViewWindow .sidebar .scrollbar.slider.fine-tune, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider.fine-tune { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune { border-width: 4px; } - GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider.fine-tune:prelight:active, + GtkFileChooserDialog .sidebar .scrollbar.slider.fine-tune:prelight:active, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NautilusWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, - NautilusWindow .source-list.sidebar.view .scrollbar.slider.fine-tune:prelight:active, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, NemoWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, - NemoWindow .source-list.sidebar.view .scrollbar.slider.fine-tune:prelight:active, + NemoWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active, MarlinViewWindow .sidebar .scrollbar.slider.fine-tune:prelight:active, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider.fine-tune:prelight:active { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider.fine-tune:prelight:active { background-color: #5294E2; } - GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.slider:insensitive, + GtkFileChooserDialog .sidebar .scrollbar.slider:insensitive, GtkFileChooserDialog MarlinPlacesSidebar .scrollbar.slider:insensitive, NautilusWindow .sidebar .scrollbar.slider:insensitive, - NautilusWindow .source-list.sidebar.view .scrollbar.slider:insensitive, + NautilusWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, NemoWindow .sidebar .scrollbar.slider:insensitive, - NemoWindow .source-list.sidebar.view .scrollbar.slider:insensitive, + NemoWindow MarlinPlacesSidebar .scrollbar.slider:insensitive, MarlinViewWindow .sidebar .scrollbar.slider:insensitive, - MarlinViewWindow .source-list.sidebar.view .scrollbar.slider:insensitive { + MarlinViewWindow MarlinPlacesSidebar .scrollbar.slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, NautilusWindow.maximized .sidebar, diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss index 40181b2..7ca39c0 100644 --- a/common/gtk-3.0/3.16/_common.scss +++ b/common/gtk-3.0/3.16/_common.scss @@ -242,7 +242,7 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } &.progressbar { - margin: 2px; + margin: 2px 12px; border-radius: 0; border-width: 0 0 2px; border-color: $selected_bg_color; @@ -1195,6 +1195,12 @@ GtkComboBox { background-color: $selected_fg_color; color: $selected_bg_color; } + + &.progressbar { + border-color: $selected_bg_color; + background-image: none; + background-color: transparent; + } } // Header-bar Buttons 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 e46b99d..068fb53 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -169,7 +169,7 @@ GtkTextView { background-color: #5294E2; color: #ffffff; } .entry.progressbar { - margin: 2px; + margin: 2px 12px; border-radius: 0; border-width: 0 0 2px; border-color: #5294E2; @@ -904,6 +904,10 @@ GtkComboBox { .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } + .primary-toolbar .entry.progressbar, .header-bar .entry.progressbar { + border-color: #5294E2; + background-image: none; + background-color: transparent; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); outline-color: rgba(82, 93, 118, 0.1); diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 3a503e9..4289ee0 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -169,7 +169,7 @@ GtkTextView { background-color: #5294E2; color: #ffffff; } .entry.progressbar { - margin: 2px; + margin: 2px 12px; border-radius: 0; border-width: 0 0 2px; border-color: #5294E2; @@ -904,6 +904,10 @@ GtkComboBox { .primary-toolbar .entry:selected:focus, .header-bar .entry:selected:focus { background-color: #ffffff; color: #5294E2; } + .primary-toolbar .entry.progressbar, .header-bar .entry.progressbar { + border-color: #5294E2; + background-image: none; + background-color: transparent; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); outline-color: rgba(82, 93, 118, 0.1); diff --git a/common/unity/sheet_style_close_focused.svg b/common/unity/sheet_style_close_focused.svg new file mode 120000 index 0000000..0749829 --- /dev/null +++ b/common/unity/sheet_style_close_focused.svg @@ -0,0 +1 @@ +close_unfocused.svg \ No newline at end of file diff --git a/common/unity/sheet_style_close_focused_prelight.svg b/common/unity/sheet_style_close_focused_prelight.svg new file mode 120000 index 0000000..64b2bff --- /dev/null +++ b/common/unity/sheet_style_close_focused_prelight.svg @@ -0,0 +1 @@ +close_focused_prelight.svg \ No newline at end of file diff --git a/common/unity/sheet_style_close_focused_pressed.svg b/common/unity/sheet_style_close_focused_pressed.svg new file mode 120000 index 0000000..ba6d4fe --- /dev/null +++ b/common/unity/sheet_style_close_focused_pressed.svg @@ -0,0 +1 @@ +close_unfocused_pressed.svg \ No newline at end of file