diff --git a/resources/css/style.css b/resources/css/style.css index a0749ca20..8403fb4de 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -1,6 +1,6 @@ QWidget { - background-color: #EAECF0; - color: #000000; + background-color: #DFE1E5; + color: #202124; } @@ -14,7 +14,8 @@ TopWidget { margin: 0; padding: 5px; border: none; - border-bottom: 1px solid #ccc; + border-bottom: 1px solid #DADCE0; + background-color: #FFFFFF; } TopWidget::separator { @@ -31,48 +32,47 @@ QToolButton { } SearchBar { - background-color: white; + background-color: #F1F3F4; margin: 2px; /* XXX: duplicated in css_constants.h */ - border: 1px solid #ccc; /* XXX: duplicated in css_constants.h */ - border-radius: 3px; + border: none; + border-radius: 18px; - max-height: 40px; + max-height: 36px; } SearchBar > QLabel#searchIcon { padding: 0; border: none; - background-color: none; + background-color: transparent; margin: 0px 6px; - max-height: 38px; - max-width: 38px; + max-height: 36px; + max-width: 36px; } SearchBar > SearchBarLineEdit { - background-color: white; + background-color: transparent; margin: 0; padding: 0; - color: #666; + color: #3C4043; border: none; - font-size: 16px; + font-size: 15px; - max-height: 38px; + max-height: 36px; } SearchBar > QToolButton { padding: 0; - border: 0 solid #fff; - background-color: none; - max-height: 38px; - max-width: 38px; + border: none; + background-color: transparent; + max-height: 36px; + max-width: 36px; + border-radius: 18px; } SearchBar > QToolButton:pressed, SearchBar > QToolButton:hover { - border: 1px solid #3366CC; - background-color: #D9E9FF; - border-radius: 3px; + background-color: #E8EAED; } MultiZimButton QListWidget { @@ -123,9 +123,9 @@ ZimItemWidget QRadioButton::indicator:checked { TopWidget QToolButton:pressed, TopWidget QToolButton::hover { - border: 1px solid #3366CC; - background-color: #D9E9FF; - border-radius: 3px; + background-color: rgba(0, 0, 0, 0.06); + border-radius: 20px; + border: none; } TopWidget QToolButton::menu-button { @@ -205,9 +205,10 @@ WebViewForwardMenu::icon, WebViewBackMenu::icon { */ QTabBar { - font-size: 16px; - icon-size: 24px; - border-bottom: 1px solid #ccc; + font-size: 15px; + icon-size: 20px; + border: none; + background-color: transparent; } QTabBar::tear { @@ -217,45 +218,49 @@ QTabBar::tear { } QTabWidget::pane { - top: -2px; + top: 0px; border: none; - border-top: 1px solid #ccc; } QTabBar::tab { - border: 1px solid #ccc; /* XXX: duplicated in css_constants.h */ - border-radius: 0; - padding: 4px; /* XXX: duplicated in css_constants.h */ - padding-top: 6px; + background-color: transparent; + border: none; + border-top-left-radius: 12px; + border-top-right-radius: 12px; + padding: 8px 16px; + margin-right: 2px; + margin-top: 6px; + min-width: 120px; } -QTabBar::tab:selected { - background-color: white; - border-bottom: 1px solid white; +QTabBar::tab:hover { + background-color: rgba(255, 255, 255, 0.5); } -QTabBar::tab:first { - padding-top: 6px; - padding-left: 5px; +QTabBar::tab:selected { + background-color: #FFFFFF; + color: #202124; } + #closeTabButton, #newTabButton { - font-size: 30px; - width: 30px; min-width: 30px; max-width: 30px; - height: 30px; min-height:30px; max-height:30px; - border-radius: 3px; + font-size: 20px; + width: 28px; min-width: 28px; max-width: 28px; + height: 28px; min-height:28px; max-height:28px; + border-radius: 14px; } #nextTabButton, #prevTabButton, #newTabSideButton { - border: 1px solid #ccc; + border: none; + background: transparent; } #closeTabButton:hover, #newTabButton:hover, #nextTabButton:hover, #prevTabButton:hover, #newTabSideButton:hover { - border: 1px solid #3366CC; - background-color: #D9E9FF; - border-radius: 3px; + background-color: rgba(0, 0, 0, 0.08); + border-radius: 14px; + border: none; } QTabBar::scroller { diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 269b91bf2..a7b7b52d7 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -115,6 +115,16 @@ + + + + false + + + false + + + @@ -162,20 +172,6 @@ - - - false - - - false - - - TopToolBarArea - - - false - -