From 04bf40a923910f36f306673dbcadf5e2747b03a1 Mon Sep 17 00:00:00 2001 From: randx Date: Mon, 11 Jun 2012 20:52:32 +0300 Subject: [PATCH] Refactored theme css, added Modern theme pre version --- app/assets/images/logo_text_tr.png | Bin 0 -> 3290 bytes app/assets/stylesheets/gitlab_bootstrap.scss | 2 +- app/assets/stylesheets/main.scss | 9 +- .../stylesheets/{ => themes}/ui_basic.scss | 0 .../stylesheets/{ => themes}/ui_mars.scss | 0 app/assets/stylesheets/themes/ui_modern.scss | 143 ++++++++++++++++++ app/helpers/application_helper.rb | 7 +- app/views/profile/design.html.haml | 4 + app/views/refs/_tree_file.html.haml | 3 +- lib/gitlab/theme.rb | 15 ++ 10 files changed, 172 insertions(+), 11 deletions(-) create mode 100644 app/assets/images/logo_text_tr.png rename app/assets/stylesheets/{ => themes}/ui_basic.scss (100%) rename app/assets/stylesheets/{ => themes}/ui_mars.scss (100%) create mode 100644 app/assets/stylesheets/themes/ui_modern.scss create mode 100644 lib/gitlab/theme.rb diff --git a/app/assets/images/logo_text_tr.png b/app/assets/images/logo_text_tr.png new file mode 100644 index 0000000000000000000000000000000000000000..fdb32ee29fe17975fbb229c828458819aaf3ca42 GIT binary patch literal 3290 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 .container { + background:#FFF; + border: 1px solid #ccc; + padding:20px; + margin-top:30px; + -moz-box-shadow: 0 0 1px 1px #E3E3E3; + -webkit-box-shadow: 0 0 1px 1px #E3E3E3; + box-shadow: 0 0 1px 1px #E3E3E3; + } + + nav.main_menu { + position: absolute; + width: 100%; + left: 0; + top: 35px; + @include border-radius(0px); + + a.current { + border-bottom:none; + } + } + + .commit-box, .issue_form_box { + margin-top: 0px; + } + + .ui-box { + @include border-radius(0px); + } + + /* + * Common styles + * + */ + a { + color: $link_color; + &:hover { + text-decoration:none; + color: $blue_link; + } + } + + + /* + * Application Header + * + */ + header { + width:100%; + padding:0; + margin:0; + top:1px; + left:0; + background: #FFF; /* for non-css3 browsers */ + z-index:10; + height:100px; + + .app_logo { + float:left; + position:relative; + top:-5px; + + a { + float:left; + + h1 { + + left: -30px; + position: relative; + text-indent:-9999px; + width:112px; + background: url('logo_text_tr.png') no-repeat 0px 0; + float:left; + font-size:20px; + line-height:36px; + font-weight:bold; + color:#aaa; + text-shadow: 0 1px 1px #FFF; + padding-left:50px; + } + } + } + .container { + .top_panel_content { + margin:auto; + position:relative; + padding:15px 0; + } + } + + .project_name { + float:left; + margin:0; + margin-right:30px; + font-size:20px; + line-height:36px; + font-weight:bold; + color:$style_color; + text-shadow: 0 1px 1px #FFF; + } + + .fbtn { + float: right; + margin-right:10px; + .btn { + margin-left:8px; + } + } + + .search { + float: right; + margin-right: 55px; + + .search-input { + width:130px; + background-image: url("icon-search.png"); + background-repeat: no-repeat; + background-position: 10px; + padding-left:25px; + @include border-radius(5px); + border:1px solid #ccc; + } + } + } + /* + * End of Application Header + * + */ +} diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 85595c1e..6b9e457c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -85,11 +85,6 @@ module ApplicationHelper end def app_theme - if current_user && current_user.theme_id == 1 - "ui_basic" - else - "ui_mars" - end + Gitlab::Theme.css_class_by_id(current_user.try(:theme_id)) end - end diff --git a/app/views/profile/design.html.haml b/app/views/profile/design.html.haml index 1942e83d..ff6ae7f5 100644 --- a/app/views/profile/design.html.haml +++ b/app/views/profile/design.html.haml @@ -10,6 +10,10 @@ = label_tag do = f.radio_button :theme_id, 2 Classic + + = label_tag do + = f.radio_button :theme_id, 3 + Modern %br %h3 Code review %hr diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml index 201028dc..ee56ab36 100644 --- a/app/views/refs/_tree_file.html.haml +++ b/app/views/refs/_tree_file.html.haml @@ -21,8 +21,7 @@ = preserve do = raw file.colorize(options: { linenos: 'True'}) - else - %h3 - %center Empty file + %h4.nothing_here_message Empty file - elsif file.image? .view_file_content_image %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} diff --git a/lib/gitlab/theme.rb b/lib/gitlab/theme.rb new file mode 100644 index 00000000..6e2be765 --- /dev/null +++ b/lib/gitlab/theme.rb @@ -0,0 +1,15 @@ +module Gitlab + class Theme + def self.css_class_by_id(id) + themes = { + 1 => "ui_basic", + 2 => "ui_mars", + 3 => "ui_modern" + } + + id ||= 1 + + return themes[id] + end + end +end