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

Modern theme restyled. Better Profile -> Ui page

parent 463644c8
......@@ -342,6 +342,7 @@ p.time {
margin-top: 5px;
li.commit {
background: transparent;
padding:5px;
border:none;
}
......@@ -709,3 +710,22 @@ li.note {
}
}
}
.themes_opts {
padding-left:20px;
label {
width:175px;
margin-right:40px;
.prev {
@extend .borders;
height:120px;
width:175px;
margin-bottom:10px;
img {
width:180px;
}
}
}
}
......@@ -9,61 +9,128 @@
*
*/
.ui_modern {
ul.main_menu {
background:none;
box-shadow:none;
@include border-radius(0px);
border:none;
border-bottom:2px solid #456;
/*
* Application Header
*
*/
header {
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);
li {
border:none;
.container .top_panel_content { padding: 5px 0; }
&.current {
border-bottom:2px solid #f90;
background-color:#fff;
position:relative;
top:2px;
}
}
}
/*
* Common styles
/**
*
* Logo holder
*
*/
.app_logo {
a {
color: #E28934;
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 {
text-decoration:none;
color: #f90;
opacity: 1.0;
}
}
}
.separator {
width: 1px;
height: 40px;
margin: 0 9px;
overflow: hidden;
background: #222;
border-left: 1px solid #333;
}
}
.fbtn {
.btn {
&.primary,
&.btn-primary {
border-color:#C60;
background:#D70;
i {
@extend .icon-white;
position: relative;
top: 2px;
}
background:none;
margin-left:8px;
font-size: 13px;
line-height: 19px;
color:#ccc;
&:hover {
background:#F90;
color:#fff;
}
border: none;
box-shadow:none;
text-shadow: 0 -1px 0 #000000;
}
}
.alert-info {
border-color:#FDA;
background:#FED;
color:#D70;
}
/**
*
* Search box
*
*/
.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);
&:focus {
background-color: white;
}
}
.search-input::-webkit-input-placeholder {
color: #666;
}
}
.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)
%li.wll.commit
%li.commit
%p
= link_to commit.short_id(8), project_commit_path(project, id: commit.id), class: "commit_short_id"
%strong.cdark= commit.author_name
......
= form_for @user, url: profile_update_path, remote: true, method: :put do |f|
%div
%h3 Application theme
%hr
.clearfix
%h3.page_title Application theme
%br
.themes_opts
= label_tag do
.prev
= image_tag "gitlab_default.png"
= f.radio_button :theme_id, 1
Default
= label_tag do
.prev
= image_tag "gitlab_classic.png"
= f.radio_button :theme_id, 2
Classic
= label_tag do
.prev
= image_tag "gitlab_modern.png"
= f.radio_button :theme_id, 3
Modern
%br
%h3 Code review
%hr
.row
%label.span3{for: "user_dark_scheme_false"}
.thumbnail
= image_tag "white.png", width: 260, class: "styled_image"
.caption
%h5
.clearfix
%h3.page_title Code review
%br
.themes_opts
= label_tag do
.prev
= image_tag "white.png"
= f.radio_button :dark_scheme, false
White code preview
%label.span3{for: "user_dark_scheme_true"}
.thumbnail
= image_tag "dark.png", width: 260, class: "styled_image"
.caption
%h5
= label_tag do
.prev
= image_tag "dark.png"
= f.radio_button :dark_scheme, true
Dark code preview
......
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