Skip to content

G
gitlab-ce
Commit 6ebd360c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Modern theme restyled. Better Profile -> Ui page

parent 463644c8
Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 181 deletions
app/assets/stylesheets/common.scss
View file @ 6ebd360c
...@@ -6,28 +6,28 @@ ...@@ -6,28 +6,28 @@
/** LAYOUT **/ /** LAYOUT **/
.container { .container {
padding-top:0; padding-top:0;
z-index:5; z-index:5;
} }
.container .content { .container .content {
margin:0 0; margin:0 0;
} }
.container .sidebar { .container .sidebar {
width: 200px; width: 200px;
height:100%; height:100%;
min-height:450px; min-height:450px;
float:right; float:right;
} }
.profile_avatar_holder { .profile_avatar_holder {
float:left; float:left;
width:60px; width:60px;
height:60px; height:60px;
margin-right:20px; margin-right:20px;
img { img {
width:60px; width:60px;
height:60px; height:60px;
background:#eee; background:#eee;
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
.visible_link, .visible_link,
.author_link { .author_link {
color: $link_color; color: $link_color;
} }
.widget { .widget {
@include shade; @include shade;
padding:20px; padding:20px;
margin-bottom:20px; margin-bottom:20px;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
border-radius: 5px; border-radius: 5px;
background:#fafafa; background:#fafafa;
.link_holder { .link_holder {
background:#eee; background:#eee;
position:relative; position:relative;
left:-20px; left:-20px;
...@@ -57,16 +57,16 @@ ...@@ -57,16 +57,16 @@
width:100%; width:100%;
border-top:1px solid #ccc; border-top:1px solid #ccc;
a { a {
font-size:14px; font-size:14px;
color:#666; color:#666;
} }
} }
} }
.help li { color:#111 } .help li { color:#111 }
.back_link { .back_link {
text-decoration:underline; text-decoration:underline;
font-size:14px; font-size:14px;
font-weight:bold; font-weight:bold;
...@@ -74,31 +74,31 @@ ...@@ -74,31 +74,31 @@
padding-bottom:0; padding-bottom:0;
} }
.info_link { .info_link {
margin-right:5px; margin-right:5px;
float:left; float:left;
img { img {
width:20px; width:20px;
} }
} }
.download_repo_link { .download_repo_link {
background: url("images.png") no-repeat 0 -48px; background: url("images.png") no-repeat 0 -48px;
padding-left:20px; padding-left:20px;
} }
.number { .number {
border-radius: 4px; border-radius: 4px;
text-shadow: none; text-shadow: none;
background: rgba(0,0,0,.12); background: rgba(0,0,0,.12);
text-align: center; text-align: center;
padding: 2px 4px; padding: 2px 4px;
line-height:18px; line-height:18px;
margin-left:2px; margin-left:2px;
} }
table a code { table a code {
position: relative; position: relative;
top: -2px; top: -2px;
margin-right: 3px; margin-right: 3px;
...@@ -108,7 +108,7 @@ table a code { ...@@ -108,7 +108,7 @@ table a code {
margin-top: 5px; margin-top: 5px;
} }
.loading { .loading {
margin:20px auto; margin:20px auto;
background: url(ajax_loader.gif) no-repeat center center; background: url(ajax_loader.gif) no-repeat center center;
width:40px; width:40px;
...@@ -198,12 +198,12 @@ a.project-update.titled { ...@@ -198,12 +198,12 @@ a.project-update.titled {
} }
} }
input.git_clone_url { input.git_clone_url {
width:325px; width:325px;
} }
.merge-request-form-holder { .merge-request-form-holder {
select { select {
width:300px; width:300px;
} }
} }
...@@ -217,17 +217,17 @@ input.git_clone_url { ...@@ -217,17 +217,17 @@ input.git_clone_url {
height: 100px; height: 100px;
} }
.project_list_url { .project_list_url {
width:250px; width:250px;
background:#fff !important; background:#fff !important;
} }
/** bordered list **/ /** bordered list **/
ul.bordered-list { ul.bordered-list {
margin:5px 0px; margin:5px 0px;
padding:0px; padding:0px;
li { li {
padding: 5px 0; padding: 5px 0;
border-bottom: 1px solid #EEE; border-bottom: 1px solid #EEE;
overflow: hidden; overflow: hidden;
...@@ -236,25 +236,25 @@ ul.bordered-list { ...@@ -236,25 +236,25 @@ ul.bordered-list {
} }
} }
ul.bordered-list li:last-child { border:none } ul.bordered-list li:last-child { border:none }
.line_holder { .line_holder {
&:hover { &:hover {
td { td {
background: #FFFFCF !important; background: #FFFFCF !important;
} }
} }
} }
li.commit { li.commit {
.avatar { .avatar {
width:24px; width:24px;
top:-3px; top:-3px;
margin-right:10px; margin-right:10px;
margin-left:10px; margin-left:10px;
} }
code { code {
padding: 2px 2px 0; padding: 2px 2px 0;
margin-top: -2px; margin-top: -2px;
&:hover { &:hover {
...@@ -270,21 +270,21 @@ p.time { ...@@ -270,21 +270,21 @@ p.time {
} }
/** /**
* Dashboard page * Dashboard page
* *
*/ */
.dashboard_category { .dashboard_category {
margin-bottom:30px; margin-bottom:30px;
h3 a { h3 a {
color:#474D57; color:#474D57;
&:hover { &:hover {
text-decoration:underline; text-decoration:underline;
} }
} }
.dashboard_block { .dashboard_block {
.dash_project_item { .dash_project_item {
margin-bottom:10px; margin-bottom:10px;
border:none; border:none;
padding:0px 5px; padding:0px 5px;
...@@ -292,7 +292,7 @@ p.time { ...@@ -292,7 +292,7 @@ p.time {
color:#888; color:#888;
&:hover { &:hover {
color:#111; color:#111;
.ico.project { .ico.project {
background-position:-209px -21px; background-position:-209px -21px;
} }
} }
...@@ -304,7 +304,7 @@ p.time { ...@@ -304,7 +304,7 @@ p.time {
} }
} }
.styled_image { .styled_image {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
...@@ -313,23 +313,23 @@ p.time { ...@@ -313,23 +313,23 @@ p.time {
box-shadow: 0 0 5px #888; box-shadow: 0 0 5px #888;
} }
.event_feed { .event_feed {
min-height:40px; min-height:40px;
border-bottom:1px solid #ddd; border-bottom:1px solid #ddd;
.avatar { .avatar {
width:32px; width:32px;
} }
.event_icon { .event_icon {
float:right; float:right;
margin-right:2px; margin-right:2px;
img { img {
width:20px; width:20px;
} }
} }
ul { ul {
margin-left:50px; margin-left:50px;
margin-bottom:5px; margin-bottom:5px;
.avatar { .avatar {
width:24px; width:24px;
} }
} }
...@@ -338,17 +338,18 @@ p.time { ...@@ -338,17 +338,18 @@ p.time {
&:last-child { border:none } &:last-child { border:none }
.wll:hover { background:none } .wll:hover { background:none }
.event_commits { .event_commits {
margin-top: 5px; margin-top: 5px;
li.commit { li.commit {
background: transparent;
padding:5px; padding:5px;
border:none; border:none;
} }
} }
} }
.ico { .ico {
background: url("images.png") no-repeat -85px -77px; background: url("images.png") no-repeat -85px -77px;
width: 19px; width: 19px;
height: 16px; height: 16px;
...@@ -357,24 +358,24 @@ p.time { ...@@ -357,24 +358,24 @@ p.time {
margin-right: 10px; margin-right: 10px;
top: 8px; top: 8px;
&.project { &.project {
background-position: -37px -77px; background-position: -37px -77px;
} }
&.activities { &.activities {
background-position:-162px -22px; background-position:-162px -22px;
} }
&.projects { &.projects {
background-position:-209px -21px; background-position:-209px -21px;
} }
} }
.leftbar { .leftbar {
h5, .title { h5, .title {
padding:5px 10px; padding:5px 10px;
} }
h4 { h4 {
font-size:14px; font-size:14px;
padding:2px 10px; padding:2px 10px;
color:#666; color:#666;
...@@ -382,41 +383,41 @@ p.time { ...@@ -382,41 +383,41 @@ p.time {
} }
a:last-child h4 { border:none; } a:last-child h4 { border:none; }
a:hover { a:hover {
h4 { h4 {
color:#111; color:#111;
background:$hover; background:$hover;
border-color:#CCC; border-color:#CCC;
.ico.project { .ico.project {
background-position:-209px -21px; background-position:-209px -21px;
} }
} }
} }
.bottom { .bottom {
padding:10px; padding:10px;
} }
} }
.btn { .btn {
&.very_small { &.very_small {
font-size:11px; font-size:11px;
padding:2px 6px; padding:2px 6px;
margin:2px; margin:2px;
} }
&.grouped { &.grouped {
margin-right:7px; margin-right:7px;
float:left; float:left;
} }
&.padded { &.padded {
margin-right:3px; margin-right:3px;
padding:4px 10px 4px; padding:4px 10px 4px;
} }
} }
.prettyprint { .prettyprint {
background-color: #fefbf3; background-color: #fefbf3;
padding: 9px; padding: 9px;
border: 1px solid rgba(0,0,0,.2); border: 1px solid rgba(0,0,0,.2);
...@@ -443,7 +444,7 @@ p.time { ...@@ -443,7 +444,7 @@ p.time {
.readme { .readme {
pre { pre {
background: white !important; background: white !important;
code { code {
background: none !important; background: none !important;
} }
...@@ -451,11 +452,11 @@ p.time { ...@@ -451,11 +452,11 @@ p.time {
} }
.highlight_word { .highlight_word {
background:#EEDC94; background:#EEDC94;
} }
.status_info { .status_info {
font-size:14px; font-size:14px;
padding:5px 15px; padding:5px 15px;
line-height:24px; line-height:24px;
...@@ -464,13 +465,13 @@ p.time { ...@@ -464,13 +465,13 @@ p.time {
float:left; float:left;
margin-right:20px; margin-right:20px;
&.success { &.success {
background: #5BB75B; background: #5BB75B;
color: white; color: white;
text-shadow: 0 1px #111; text-shadow: 0 1px #111;
border-color: #9A9; border-color: #9A9;
} }
&.error { &.error {
background: #DA4E49; background: #DA4E49;
border-color: #BD362F; border-color: #BD362F;
color: white; color: white;
...@@ -478,7 +479,7 @@ p.time { ...@@ -478,7 +479,7 @@ p.time {
} }
} }
.arrow{ .arrow{
background: #E3E5EA; background: #E3E5EA;
padding: 5px; padding: 5px;
margin-top:5px; margin-top:5px;
...@@ -493,12 +494,12 @@ p.time { ...@@ -493,12 +494,12 @@ p.time {
height: 150px; height: 150px;
} }
.gitlab_pagination { .gitlab_pagination {
span a { color:$link_color; } span a { color:$link_color; }
.prev, .next, .current, .page a { .prev, .next, .current, .page a {
padding:10px; padding:10px;
} }
.current { .current {
border-bottom:2px solid $style_color; border-bottom:2px solid $style_color;
} }
} }
...@@ -524,8 +525,8 @@ li.note { ...@@ -524,8 +525,8 @@ li.note {
} }
} }
.markdown { .markdown {
img { img {
max-width:100%; max-width:100%;
} }
} }
...@@ -534,20 +535,20 @@ li.note { ...@@ -534,20 +535,20 @@ li.note {
background-color: inherit; background-color: inherit;
} }
.team_member_show { .team_member_show {
td:first-child { td:first-child {
color:#aaa; color:#aaa;
} }
} }
.remember_me { .remember_me {
text-align:left; text-align:left;
input { input {
margin:0; margin:0;
} }
span { span {
padding-left:5px; padding-left:5px;
} }
} }
...@@ -558,7 +559,7 @@ li.note { ...@@ -558,7 +559,7 @@ li.note {
* *
*/ */
.milestone { .milestone {
@extend .wll; @extend .wll;
} }
...@@ -566,10 +567,10 @@ li.note { ...@@ -566,10 +567,10 @@ li.note {
* Admin area * Admin area
* *
*/ */
.admin_dash { .admin_dash {
.data { .data {
a { a {
h1 { h1 {
line-height:48px; line-height:48px;
font-size:48px; font-size:48px;
padding:20px; padding:20px;
...@@ -585,7 +586,7 @@ li.note { ...@@ -585,7 +586,7 @@ li.note {
vertical-align:top; vertical-align:top;
} }
strong { strong {
line-height:24px; line-height:24px;
} }
} }
...@@ -593,20 +594,20 @@ li.note { ...@@ -593,20 +594,20 @@ li.note {
/* CHZN reset few styles */ /* CHZN reset few styles */
.chzn-container-single .chzn-single { .chzn-container-single .chzn-single {
background:#FFF; background:#FFF;
border: 1px solid #bbb; border: 1px solid #bbb;
box-shadow:none; box-shadow:none;
} }
.chzn-container-active .chzn-single { .chzn-container-active .chzn-single {
background:#fff; background:#fff;
} }
/** /**
* Push event widget * Push event widget
* *
*/ */
.event_lp { .event_lp {
@extend .alert-info; @extend .alert-info;
margin-bottom:20px; margin-bottom:20px;
padding:8px; padding:8px;
...@@ -615,19 +616,19 @@ li.note { ...@@ -615,19 +616,19 @@ li.note {
@include border-radius(4px); @include border-radius(4px);
min-height:22px; min-height:22px;
.avatar { .avatar {
width:24px; width:24px;
} }
} }
.supp_diff_link, .supp_diff_link,
.mr_show_all_commits { .mr_show_all_commits {
cursor:pointer; cursor:pointer;
} }
/** /**
* Issues, MRs legend * Issues, MRs legend
* *
*/ */
.list_legend { .list_legend {
...@@ -640,32 +641,32 @@ li.note { ...@@ -640,32 +641,32 @@ li.note {
margin-right:5px; margin-right:5px;
margin-top: 2px; margin-top: 2px;
@include border-radius(4px); @include border-radius(4px);
&.today{ &.today{
background: #ADA; background: #ADA;
border:1px solid #8B8; border:1px solid #8B8;
} }
&.closed { &.closed {
background: #DDD; background: #DDD;
border:1px solid #BBB; border:1px solid #BBB;
} }
&.yours { &.yours {
background: #AAD; background: #AAD;
border:1px solid #88B; border:1px solid #88B;
} }
&.merged { &.merged {
background: #DAD; background: #DAD;
border:1px solid #B8B; border:1px solid #B8B;
} }
} }
.text { .text {
padding-bottom: 10px; padding-bottom: 10px;
float:left; float:left;
} }
} }
.merge_request, .merge_request,
.issue { .issue {
.list_legend { .list_legend {
margin-right: 5px; margin-right: 5px;
margin-top: 14px; margin-top: 14px;
.icon { .icon {
...@@ -678,34 +679,53 @@ li.note { ...@@ -678,34 +679,53 @@ li.note {
} }
} }
&.today{ &.today{
background: #EFE; background: #EFE;
border-color:#CEC; border-color:#CEC;
.icon { .icon {
background: #ADA; background: #ADA;
border:1px solid #8B8; border:1px solid #8B8;
} }
} }
&.closed { &.closed {
background: #F5f5f5; background: #F5f5f5;
border-color:#E5E5E5; border-color:#E5E5E5;
.icon { .icon {
background: #DDD; background: #DDD;
border:1px solid #BBB; border:1px solid #BBB;
} }
} }
&.yours { &.yours {
.icon { .icon {
background: #AAD; background: #AAD;
border:1px solid #88B; border:1px solid #88B;
} }
} }
&.merged { &.merged {
background: #F5f5f5; background: #F5f5f5;
border-color:#E5E5E5; border-color:#E5E5E5;
.icon { .icon {
background: #DAD; background: #DAD;
border:1px solid #B8B; border:1px solid #B8B;
} }
} }
} }
.themes_opts {
padding-left:20px;
label {
width:175px;
margin-right:40px;
.prev {
@extend .borders;
height:120px;
width:175px;
margin-bottom:10px;
img {
width:180px;
}
}
}
}
app/assets/stylesheets/themes/ui_modern.scss
View file @ 6ebd360c
/** /**
* 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;
}
}
} }
} }
app/views/events/_commit.html.haml
View file @ 6ebd360c
- 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
......
app/views/profile/design.html.haml
View file @ 6ebd360c
= 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7