diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-15 19:59:40 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-15 19:59:40 +0400 |
commit | e0fe17ee4a6961d57bb96f594332a1facf82921f (patch) | |
tree | 89c7bf4f065dda1c94c792361c77a81b9d571d56 /app | |
parent | 21b31a675dd314f987276e64c7c5f7aa9b30f4fb (diff) |
cleaning & image resize
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/images/Gear-UI.PNG | bin | 1335 -> 1019 bytes | |||
-rw-r--r-- | app/assets/images/Home-UI.PNG | bin | 891 -> 890 bytes | |||
-rw-r--r-- | app/assets/images/blueprint_notice.png | bin | 4531 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/git.png | bin | 21559 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/home.png | bin | 271 -> 0 bytes | |||
-rw-r--r-- | app/assets/stylesheets/projects.css.scss | 22 | ||||
-rw-r--r-- | app/assets/stylesheets/style.scss | 11 | ||||
-rw-r--r-- | app/models/repository.rb | 4 |
8 files changed, 18 insertions, 19 deletions
diff --git a/app/assets/images/Gear-UI.PNG b/app/assets/images/Gear-UI.PNG Binary files differindex 1b4291ad8fb..c1d84e06da6 100644 --- a/app/assets/images/Gear-UI.PNG +++ b/app/assets/images/Gear-UI.PNG diff --git a/app/assets/images/Home-UI.PNG b/app/assets/images/Home-UI.PNG Binary files differindex c6925c0edd2..f57f8d09c86 100644 --- a/app/assets/images/Home-UI.PNG +++ b/app/assets/images/Home-UI.PNG diff --git a/app/assets/images/blueprint_notice.png b/app/assets/images/blueprint_notice.png Binary files differdeleted file mode 100644 index e00264986ac..00000000000 --- a/app/assets/images/blueprint_notice.png +++ /dev/null diff --git a/app/assets/images/git.png b/app/assets/images/git.png Binary files differdeleted file mode 100644 index cb5d0590efa..00000000000 --- a/app/assets/images/git.png +++ /dev/null diff --git a/app/assets/images/home.png b/app/assets/images/home.png Binary files differdeleted file mode 100644 index 316d5d4287a..00000000000 --- a/app/assets/images/home.png +++ /dev/null diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index ca9001b4c3c..b8c938d0e2d 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -561,14 +561,10 @@ h4.middle-panel { margin:0px; font-size: 12px; - border-radius: 0px; - -moz-border-radius: 0px; + margin-right:10px; + border-radius: 4px; + -moz-border-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; - - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; color: #666; border: 1px solid #AAA; @@ -595,16 +591,16 @@ h4.middle-panel { .chzn-single { background:white; - -moz-border-radius: 0; - border-radius: 0; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; div { background:white; } + + span { + font-weight: normal; + } } } diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 62ed6320db1..8172a45a86d 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -565,7 +565,7 @@ input.search-input{ background-color: #FFF; padding: 5px; padding-left: 26px; - margin-top: 4px; + margin-top: 2px; margin-right: 10px; } /*input.search-input:focus{ background-color: white; width: 216px;}*/ @@ -637,18 +637,19 @@ body.project-page .project-sidebar aside{width: 109px} body.project-page .project-sidebar aside a{ display: block; position: relative; - background: #FFF; + //background: #FFF; padding: 15px 10px; - border: 1px solid #ccc; + //border: 1px solid #ccc; margin: 10px 20px 0 0; - border-radius:5px; + //border-radius:5px; } -body.project-page .project-sidebar aside a:hover{background-color: #FFFFFF;} +//body.project-page .project-sidebar aside a:hover{background-color: #FFFFFF;} body.project-page .project-sidebar aside a span.number{float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px} body.project-page .project-sidebar aside a.current { color: white; background: #79C3E0; border: 1px solid #2FA0BB; + border-radius:5px; } body.project-page .project-content{ padding: 20px; display: block; margin-left: 130px; min-height: 600px} body.project-page .project-content h2{ margin-top: 6px} diff --git a/app/models/repository.rb b/app/models/repository.rb index d36b458da83..0bf1bc18ece 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -74,7 +74,9 @@ class Repository end def repo_exists? - repo rescue false + repo && !repo.branches.empty? + rescue + false end def tags |