diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-14 00:17:13 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-14 00:17:13 +0400 |
commit | 781f5aa6fb25b4aed91f711daefdae4bce8d968b (patch) | |
tree | b4145c3a7fb45e91e5e32863e84a646c7ffa6743 /app/assets | |
parent | 0fe36374d88005379001460a74dc4d6359a35d16 (diff) |
classic theme improved, images refactored
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/images/Arrow-Left-UI.PNG | bin | 568 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/Arrow-Right-UI.PNG | bin | 561 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/add_new.png | bin | 333 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/ajax-loader-tree.gif | bin | 2608 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/diff_file_add.png (renamed from app/assets/images/blueprint_add.png) | bin | 177 -> 177 bytes | |||
-rw-r--r-- | app/assets/images/diff_file_delete.png (renamed from app/assets/images/blueprint_delete.png) | bin | 295 -> 295 bytes | |||
-rw-r--r-- | app/assets/images/diff_file_info.png (renamed from app/assets/images/blueprint_info.png) | bin | 749 -> 749 bytes | |||
-rw-r--r-- | app/assets/images/diff_file_notice.png | bin | 0 -> 302 bytes | |||
-rw-r--r-- | app/assets/images/logo_tr.png | bin | 7896 -> 3277 bytes | |||
-rw-r--r-- | app/assets/images/logo_wh.png | bin | 0 -> 2056 bytes | |||
-rw-r--r-- | app/assets/images/rails.png | bin | 6646 -> 0 bytes | |||
-rw-r--r-- | app/assets/stylesheets/ui_basic.scss | 15 | ||||
-rw-r--r-- | app/assets/stylesheets/ui_mars.scss | 57 |
13 files changed, 41 insertions, 31 deletions
diff --git a/app/assets/images/Arrow-Left-UI.PNG b/app/assets/images/Arrow-Left-UI.PNG Binary files differdeleted file mode 100644 index 80a34b411f1..00000000000 --- a/app/assets/images/Arrow-Left-UI.PNG +++ /dev/null diff --git a/app/assets/images/Arrow-Right-UI.PNG b/app/assets/images/Arrow-Right-UI.PNG Binary files differdeleted file mode 100644 index 3a38daa0cda..00000000000 --- a/app/assets/images/Arrow-Right-UI.PNG +++ /dev/null diff --git a/app/assets/images/add_new.png b/app/assets/images/add_new.png Binary files differdeleted file mode 100644 index bf2fbec2964..00000000000 --- a/app/assets/images/add_new.png +++ /dev/null diff --git a/app/assets/images/ajax-loader-tree.gif b/app/assets/images/ajax-loader-tree.gif Binary files differdeleted file mode 100644 index c69e937232b..00000000000 --- a/app/assets/images/ajax-loader-tree.gif +++ /dev/null diff --git a/app/assets/images/blueprint_add.png b/app/assets/images/diff_file_add.png Binary files differindex 0f01128df96..0f01128df96 100644 --- a/app/assets/images/blueprint_add.png +++ b/app/assets/images/diff_file_add.png diff --git a/app/assets/images/blueprint_delete.png b/app/assets/images/diff_file_delete.png Binary files differindex b4d360f329d..b4d360f329d 100644 --- a/app/assets/images/blueprint_delete.png +++ b/app/assets/images/diff_file_delete.png diff --git a/app/assets/images/blueprint_info.png b/app/assets/images/diff_file_info.png Binary files differindex 8529e82396a..8529e82396a 100644 --- a/app/assets/images/blueprint_info.png +++ b/app/assets/images/diff_file_info.png diff --git a/app/assets/images/diff_file_notice.png b/app/assets/images/diff_file_notice.png Binary files differnew file mode 100644 index 00000000000..d3b292f4907 --- /dev/null +++ b/app/assets/images/diff_file_notice.png diff --git a/app/assets/images/logo_tr.png b/app/assets/images/logo_tr.png Binary files differindex 7a934bbb62c..bc5ec128b90 100644 --- a/app/assets/images/logo_tr.png +++ b/app/assets/images/logo_tr.png diff --git a/app/assets/images/logo_wh.png b/app/assets/images/logo_wh.png Binary files differnew file mode 100644 index 00000000000..2b7335dd4f9 --- /dev/null +++ b/app/assets/images/logo_wh.png diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png Binary files differdeleted file mode 100644 index d5edc04e65f..00000000000 --- a/app/assets/images/rails.png +++ /dev/null diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss index 8efe01b8f23..64347525099 100644 --- a/app/assets/stylesheets/ui_basic.scss +++ b/app/assets/stylesheets/ui_basic.scss @@ -43,11 +43,14 @@ .app_logo { width:230px; float:left; + position:relative; + top:-5px; a { float:left; h1 { + background: url('logo_tr.png') no-repeat -3px -4px; float:left; margin-left:5px; font-size:20px; @@ -55,16 +58,8 @@ font-weight:bold; color:#aaa; text-shadow: 0 1px 1px #FFF; - } - - &.home { - img { - float: left; - position: relative; - top: -9px; - width:46px; - - } + padding-left:50px; + padding-top:5px; } } } diff --git a/app/assets/stylesheets/ui_mars.scss b/app/assets/stylesheets/ui_mars.scss index 34902879418..1178c189247 100644 --- a/app/assets/stylesheets/ui_mars.scss +++ b/app/assets/stylesheets/ui_mars.scss @@ -9,6 +9,28 @@ * */ .ui_mars { + background:#eee; + + .container { + border: 1px solid rgba(0,0,0,.22); + box-shadow: 0 0 0px 4px rgba(0,0,0,.04); + background:white; + margin-top:20px; + min-height:500px; + + nav.main_menu { + margin:0; + margin-bottom: 20px; + border:none; + border-bottom: 1px solid #bbb; + border-radius:0; + + a { + border-radius:0; + } + } + } + /* * Common styles @@ -70,30 +92,23 @@ .app_logo { width:230px; float:left; - position:relative; - top:-4px; + position:relative; + top:-5px; a { float:left; h1 { - - background: url('images.png') no-repeat -3px -7px; - width: 65px; - height: 26px; - margin: 5px 0; - padding: 0; - display: block; - float: left; - text-indent: -1000em; - - } - - &.home { - img { - display:none - - } + background: url('logo_wh.png') no-repeat -3px -4px; + float:left; + margin-left:5px; + font-size:20px; + line-height:36px; + font-weight:bold; + color:#ccc; + text-shadow: 0 1px 1px #111; + padding-left:50px; + padding-top:5px; } } } @@ -104,8 +119,8 @@ position:relative; padding:15px 0; - .top_panel_content { - margin:0 $app_padding; + .account-box img { + right:0; } } |