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 85595c1ebe2..6b9e457cc9d 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 1942e83d7a2..ff6ae7f5778 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 201028dc2ab..ee56ab36194 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 00000000000..6e2be76508a --- /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 -- GitLab