Commit 6ebd360c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Modern theme restyled. Better Profile -> Ui page

parent 463644c8
app/assets/images/gitlab_classic.png

2.98 KB

app/assets/images/gitlab_default.png

6.28 KB

app/assets/images/gitlab_modern.png

3.8 KB

This diff is collapsed.
/** /**
* This file represent some UI that can be changed * This file represent some UI that can be changed
* during web app restyle or theme select. * during web app restyle or theme select.
* *
* Next items should be placed there * Next items should be placed there
* - link colors * - link colors
* - header styles * - header styles
* - main menu styles * - main menu styles
* *
*/ */
.ui_modern { .ui_modern {
ul.main_menu { /*
background:none; * Application Header
box-shadow:none; *
@include border-radius(0px); */
border:none; header {
border-bottom:2px solid #456; height:40px;
background-image: -moz-linear-gradient(top, #333, #222);
background-image: -ms-linear-gradient(top, #333, #222);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333), to(#222));
background-image: -webkit-linear-gradient(top, #333, #222);
background-image: -o-linear-gradient(top, #333, #222);
background-image: linear-gradient(top, #333, #222);
background-repeat: repeat-x;
background-repeat: repeat-x;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
.container .top_panel_content { padding: 5px 0; }
li {
border:none;
&.current { /**
border-bottom:2px solid #f90; *
background-color:#fff; * Logo holder
position:relative; *
top:2px; */
.app_logo {
a {
h1 {
opacity: 0.7;
background: url('images.png') no-repeat -3px -6px;
width: 65px;
height: 26px;
margin: 6px 0;
padding: 0;
float: left;
text-indent: -1000em;
float:left;
&:hover {
opacity: 1.0;
}
}
}
.separator {
width: 1px;
height: 40px;
margin: 0 9px;
overflow: hidden;
background: #222;
border-left: 1px solid #333;
} }
} }
}
/* .fbtn {
* Common styles .btn {
* i {
*/ @extend .icon-white;
a { position: relative;
color: #E28934; top: 2px;
&:hover { }
text-decoration:none; background:none;
color: #f90; margin-left:8px;
font-size: 13px;
line-height: 19px;
color:#ccc;
&:hover {
color:#fff;
}
border: none;
box-shadow:none;
text-shadow: 0 -1px 0 #000000;
}
} }
}
.btn { /**
&.primary, *
&.btn-primary { * Search box
border-color:#C60; *
background:#D70; */
.search {
float: right;
margin-right: 55px;
.search-input {
border: 1px solid rgba(0, 0, 0, 0.7);
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2), 0 2px 2px rgba(0, 0, 0, 0.4) inset;
background-color: #D2D5DA;
background-color: rgba(255, 255, 255, 0.5);
&:hover { &:focus {
background:#F90; background-color: white;
}
}
.search-input::-webkit-input-placeholder {
color: #666;
} }
} }
}
.alert-info {
border-color:#FDA;
background:#FED;
color:#D70;
}
.progress .bar { /**
background:#D80; *
} * Project / Area name
*
*/
.project_name {
line-height:34px;
font-size:22px;
color:#fff;
text-shadow: 0 1px 1px #111;
}
.back_link { /**
color:#D80; *
* Account box
*
*/
.account-box {
top:6px;
img {
right: 5px;
width: 26px;
height: 26px;
}
}
} }
} }
- commit = CommitDecorator.decorate(commit) - commit = CommitDecorator.decorate(commit)
%li.wll.commit %li.commit
%p %p
= link_to commit.short_id(8), project_commit_path(project, id: commit.id), class: "commit_short_id" = link_to commit.short_id(8), project_commit_path(project, id: commit.id), class: "commit_short_id"
%strong.cdark= commit.author_name %strong.cdark= commit.author_name
– –
= image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16 = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
......
= form_for @user, url: profile_update_path, remote: true, method: :put do |f| = form_for @user, url: profile_update_path, remote: true, method: :put do |f|
%div %div
%h3 Application theme %h3.page_title Application theme
%hr %br
.clearfix .themes_opts
= label_tag do = label_tag do
.prev
= image_tag "gitlab_default.png"
= f.radio_button :theme_id, 1 = f.radio_button :theme_id, 1
Default Default
= label_tag do = label_tag do
.prev
= image_tag "gitlab_classic.png"
= f.radio_button :theme_id, 2 = f.radio_button :theme_id, 2
Classic Classic
= label_tag do = label_tag do
.prev
= image_tag "gitlab_modern.png"
= f.radio_button :theme_id, 3 = f.radio_button :theme_id, 3
Modern Modern
%br %br
%h3 Code review .clearfix
%hr
.row %h3.page_title Code review
%label.span3{for: "user_dark_scheme_false"} %br
.thumbnail .themes_opts
= image_tag "white.png", width: 260, class: "styled_image" = label_tag do
.caption .prev
%h5 = image_tag "white.png"
= f.radio_button :dark_scheme, false = f.radio_button :dark_scheme, false
White code preview White code preview
%label.span3{for: "user_dark_scheme_true"} = label_tag do
.thumbnail .prev
= image_tag "dark.png", width: 260, class: "styled_image" = image_tag "dark.png"
.caption = f.radio_button :dark_scheme, true
%h5 Dark code preview
= f.radio_button :dark_scheme, true
Dark code preview
:javascript :javascript
$(function(){ $(function(){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment