Skip to content

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

finished scss refactoring

parent 3a4b4fb4
Show whitespace changes
Inline Side-by-side
Showing with 496 additions and 501 deletions
app/assets/stylesheets/commits.css.scss deleted 100644 → 0
View file @ 3a4b4fb4
/**
*
* COMMIT SHOw
*
*/
.diff_file {
border:1px solid #CCC;
margin-bottom:1em;
.diff_file_header {
padding:5px 5px;
border-bottom:1px solid #CCC;
background: #eee;
}
.diff_file_content {
overflow:auto;
overflow-y:hidden;
background:#fff;
color:#333;
font-size: 12px;
font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace;
}
.diff_file_content_image {
background:#eee;
text-align:center;
img {
padding:100px;
max-width:300px;
}
}
}
.diff_file_content{
table {
border:none;
margin:0px;
padding:0px;
tr {
td {
font-size:12px;
}
}
}
.old_line, .new_line {
margin:0px;
padding:0px;
border:none;
background:#F7F7F7;
color:#aaa;
padding: 0px 5px;
border-right: 1px solid #ccc;
text-align:right;
min-width:35px;
max-width:35px;
width:35px;
moz-user-select: none;
-khtml-user-select: none;
user-select: none;
a {
float:left;
width:35px;
font-weight:normal;
color:#aaa;
&:hover {
text-decoration:underline;
}
}
}
.line_content {
white-space:pre;
height:14px;
margin:0px;
padding:0px;
border:none;
&.new {
background: #CFD;
}
&.old {
background: #FDD;
}
&.matched {
color:#ccc;
background:#fafafa;
}
}
}
/** COMMIT BLOCK **/
.commit-title{display: block;}
.commit-title{margin-bottom: 10px}
.commit-author, .commit-committer{display: block;color: #999; font-weight: normal; font-style: italic;}
.commit-author strong, .commit-committer strong{font-weight: bold; font-style: normal;}
/** bordered list **/
ul.bordered-list {
margin:5px 0px;
padding:0px;
li {
padding: 5px 0;
border-bottom: 1px solid #EEE;
overflow: hidden;
display: block;
margin:0px;
}
}
ul.bordered-list li:last-child { border:none }
.line_holder {
&:hover {
td {
background: #FFFFCF !important;
}
}
}
/** FLASH **/
#flash_container {
height:45px;
position:fixed;
z-index:10001;
top:0px;
width:100%;
margin-bottom:15px;
overflow:hidden;
background:white;
cursor:pointer;
border-bottom:1px solid #777;
h4 {
color:#444;
font-size:22px;
padding-top:5px;
margin:2px;
}
}
.project-refs-form.commit-refs-form .chzn-container {
position: relative;
top: 0;
left: 0;
margin-right: 10px;
}
li.commit {
.avatar {
width:24px;
top:-3px;
margin-right:10px;
margin-left:10px;
}
code {
padding:4px;
}
}
app/assets/stylesheets/common.scss
View file @ f0f14c8e
...@@ -4,6 +4,10 @@ a { ...@@ -4,6 +4,10 @@ a {
text-decoration:none; text-decoration:none;
color: $style_color; color: $style_color;
} }
&.btn {
color: $style_color;
}
} }
.vlink { .vlink {
...@@ -97,78 +101,6 @@ a { ...@@ -97,78 +101,6 @@ a {
float:right; float:right;
} }
nav.main_menu {
overflow:hidden;
border-radius: 4px;
margin: auto;
margin:30px $app_padding;
background:#eee;
border:1px solid #ccc;
height:38px;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
@include shade;
.count {
color:#aaa;
margin-left:3px;
}
.label {
background:$hover;
text-shadow:none;
color:$style_color;
}
a {
font-weight:bold;
&:first-child{
-webkit-border-top-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-topleft: 4px;
-moz-border-radius-bottomleft: 4px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
padding: 10px 25px;
display: inline-block;
color: $style_color;
border-right: 1px solid #d5d5d5;
position: relative;
box-shadow: 1px 0 0 rgba(255, 255, 255, 0.1);
margin: 0;
float:left;
text-shadow:0 1px 1px white;
&.home {
background: url(home_icon.PNG) no-repeat center center;
text-indent:-9999px;
min-width:40px;
img {
position:relative;
top:4px;
}
}
&.current {
background-color:#DDD;
}
}
}
aside.projects,
aside.project-side
{
margin-left: 0;
}
img.avatar { img.avatar {
float:left; float:left;
margin-right:15px; margin-right:15px;
...@@ -381,3 +313,297 @@ table a code { ...@@ -381,3 +313,297 @@ table a code {
width:40px; width:40px;
height:40px; height:40px;
} }
/** FLASH message **/
#flash_container {
height:45px;
position:fixed;
z-index:10001;
top:0px;
width:100%;
margin-bottom:15px;
overflow:hidden;
background:white;
cursor:pointer;
border-bottom:1px solid #777;
h4 {
color:#444;
font-size:22px;
padding-top:5px;
margin:2px;
}
}
.git_url_wrapper {
margin-right:50px
}
.file_stats {
span {
img {
width:14px;
float:left;
margin-right:6px;
padding:2px 0;
}
}
}
.handle:hover {
cursor:move;
}
span.update-author {
display:block;
}
span.update-author {
color:#999;
font-weight:normal;
font-style:italic;
}
span.update-author strong {
font-weight:bold;
font-style: normal;
}
/** UPDATE ITEM **/
span.update-author {
display:block;
}
/** END UPDATE ITEM **/
.ajax-tab-loading {
padding:40px;
display:none;
}
.dashboard-loader {
float:left;
margin:10px;
display:none;
}
.user-mention {
color:#2FA0BB;
font-weight:bold;
}
a.project-update.titled {
position:relative;
padding-left:35% !important;
.title-block {
padding:10px;
width:35%;
position:absolute;
left:0;
top:0;
}
}
/**
* Project graph
*/
#holder {
cursor: move;
height: 70%;
overflow: hidden;
}
input.git_clone_url {
width:475px;
}
.team_member_row {
img {
width:60px;
}
}
.merge-request-form-holder {
select {
width:300px;
}
}
/** Issues **/
#issue_assignee_id {
width:300px;
}
#new_issue_dialog textarea{
height: 100px;
}
.project_list_url {
width:270px;
background:#fff !important;
}
.project_tile {
@include shade;
@include round-borders-all(4px);
margin-bottom:20px;
width:338px;
float:left;
margin-left:20px;
border: 1px solid #DDD;
padding-bottom:20px;
.title {
background:#f5f5f5;
padding: 5px 10px 2px 20px;
border-bottom: 1px solid #DDD;
margin-bottom: 15px;
h3 {
&:hover {
text-decoration: underline;
}
}
}
.data {
margin: 0 20px;
}
.buttons {
margin: 0 20px;
}
}
/**
*
* COMMIT SHOw
*
*/
.diff_file {
border:1px solid #CCC;
margin-bottom:1em;
.diff_file_header {
padding:5px 5px;
border-bottom:1px solid #CCC;
background: #eee;
}
.diff_file_content {
overflow:auto;
overflow-y:hidden;
background:#fff;
color:#333;
font-size: 12px;
font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace;
}
.diff_file_content_image {
background:#eee;
text-align:center;
img {
padding:100px;
max-width:300px;
}
}
}
.diff_file_content{
table {
border:none;
margin:0px;
padding:0px;
tr {
td {
font-size:12px;
}
}
}
.old_line, .new_line {
margin:0px;
padding:0px;
border:none;
background:#F7F7F7;
color:#aaa;
padding: 0px 5px;
border-right: 1px solid #ccc;
text-align:right;
min-width:35px;
max-width:35px;
width:35px;
moz-user-select: none;
-khtml-user-select: none;
user-select: none;
a {
float:left;
width:35px;
font-weight:normal;
color:#aaa;
&:hover {
text-decoration:underline;
}
}
}
.line_content {
white-space:pre;
height:14px;
margin:0px;
padding:0px;
border:none;
&.new {
background: #CFD;
}
&.old {
background: #FDD;
}
&.matched {
color:#ccc;
background:#fafafa;
}
}
}
/** COMMIT BLOCK **/
.commit-title{display: block;}
.commit-title{margin-bottom: 10px}
.commit-author, .commit-committer{display: block;color: #999; font-weight: normal; font-style: italic;}
.commit-author strong, .commit-committer strong{font-weight: bold; font-style: normal;}
/** bordered list **/
ul.bordered-list {
margin:5px 0px;
padding:0px;
li {
padding: 5px 0;
border-bottom: 1px solid #EEE;
overflow: hidden;
display: block;
margin:0px;
}
}
ul.bordered-list li:last-child { border:none }
.line_holder {
&:hover {
td {
background: #FFFFCF !important;
}
}
}
.project-refs-form.commit-refs-form .chzn-container {
position: relative;
top: 0;
left: 0;
margin-right: 10px;
}
li.commit {
.avatar {
width:24px;
top:-3px;
margin-right:10px;
margin-left:10px;
}
code {
padding:4px;
}
}
p.time {
color: #999;
font-size: 90%;
margin: 30px 3px 3px 2px;
}
app/assets/stylesheets/main.scss
View file @ f0f14c8e
...@@ -58,19 +58,56 @@ $hover: #FDF5D9; ...@@ -58,19 +58,56 @@ $hover: #FDF5D9;
border-radius: $radius; border-radius: $radius;
} }
/**
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
* Next items should be placed there
* - link colors
* - header styles
* - main menu styles
*
*/
@import "ui_basic.scss"; @import "ui_basic.scss";
/**
* Most of application styles placed here.
* This file represent common UI that should not be changed between themes
* or project restyling like form width or user avatar class or commit title
*
* TODO: clean it
*/
@import "common.scss"; @import "common.scss";
@import "projects.css.scss"; /**
@import "commits.css.scss"; * This scss file redefine chozen selectbox styles for
* project Branch/Tag select element
*/
@import "ref_select.scss";
/**
* Code (files list) styles. Browsing project files there
*/
@import "tree.scss"; @import "tree.scss";
@import "notes.css.scss";
@import "login.scss";
/** CODE HIGHTLIGHT **/ /**
@import "highlight.css.scss"; * This file represent notes(comments) styles
@import "highlight.black.css.scss"; */
@import "notes.scss";
@import "wiki.scss"; /**
* Devise styles
*/
@import "login.scss";
/**
* CODE HIGHTLIGHT BASE
*
*/
@import "highlight.scss";
/**
* CODE HIGHTLIGHT DARK schema
*
*/
@import "highlight.black.scss";
app/assets/stylesheets/notes.css.scss → app/assets/stylesheets/notes.scss
View file @ f0f14c8e
/** Notes **/ /**
* Notes
*
*/
#notes-list { #notes-list {
display:block; display:block;
list-style:none; list-style:none;
......
app/assets/stylesheets/projects.css.scss deleted 100644 → 0
View file @ 3a4b4fb4
.git_url_wrapper {
margin-right:50px
}
.file_stats {
span {
img {
width:14px;
float:left;
margin-right:6px;
padding:2px 0;
}
}
}
.handle:hover {
cursor:move;
}
/* Project Dashboard Page */
.news-feed h2 {
float:left;
}
.news-feed .project-updates {
margin-bottom:20px;
display:block;
width:100%;
}
.news-feed .project-updates .data {
padding:0
}
.news-feed .project-updates a.project-update {
padding:10px;
border-bottom:1px solid #eee;
overflow:hidden;
display:block;
}
.news-feed .project-updates a.project-update:last-child {
border-bottom:0
}
.news-feed .project-updates a.project-update img {
float:left;
margin-right:10px;
}
span.update-title,
span.update-author {
display:block;
}
span.update-title {
margin-bottom:10px
}
span.update-author {
color:#999;
font-weight:normal;
font-style:italic;
}
span.update-author strong {
font-weight:bold;
font-style: normal;
}
/** UPDATE ITEM **/
.update-data {
padding:0
}
.update-data {
width:100%;
}
a.update-item {
padding:10px;
border-bottom:1px solid #eee;
overflow:hidden;
display:block;
}
a.update-item:last-child {
border-bottom:0
}
a.update-item img {
float:left;
margin-right:10px;
}
span.update-title,
span.update-author {
display:block;
}
a.update-item span.update-title {
margin-bottom:10px
}
a.update-item span.update-author {
color:#999;
font-weight:normal;
font-style:italic;
}
a.update-item span.update-author strong {
font-weight:bold;
font-style:normal;
}
/** END UPDATE ITEM **/
.ajax-tab-loading {
padding:40px;
display:none;
}
#tree-content-holder {
float:left;
width:100%;
}
#tree-readme-holder {
float:left;
width:100%;
.readme {
@include round-borders-all(4px);
padding:4px 15px;
background: #F7F7F7;
}
}
.dashboard-loader {
float:left;
margin:10px;
display:none;
}
.user-mention {
color:#2FA0BB;
font-weight:bold;
}
a.project-update.titled {
position:relative;
padding-left:35% !important;
.title-block {
padding:10px;
width:35%;
position:absolute;
left:0;
top:0;
}
}
/**
* Project graph
*/
#holder {
cursor: move;
height: 70%;
overflow: hidden;
}
/** Branch/tag selector **/
.project-refs-form {
margin:0;
span {
background:none !important;
position:static !important;
width:auto !important;
height:auto !important;
}
}
.project-refs-select {
width:120px;
}
.project-refs-form .chzn-container {
position:relative;
top: -5px;
left: -11px;
.chzn-drop {
margin:7px 0;
border: 1px solid #CCC;
min-width: 300px;
.chzn-results {
max-height:300px;
}
.chzn-search input {
min-width:200px;
}
}
.chzn-single {
background:#ddd;
//border:none;
//box-shadow:none;
div {
background:transparent;
border-left:none;
}
span {
font-weight: normal;
}
}
}
input.git_clone_url {
width:475px;
}
.team_member_row {
img {
width:60px;
}
}
.merge-request-form-holder {
select {
width:300px;
}
}
/** Issues **/
#issue_assignee_id {
width:300px;
}
#new_issue_dialog textarea{
height: 100px;
}
.project_list_url {
width:270px;
background:#fff !important;
}
.project_tile {
@include shade;
@include round-borders-all(4px);
margin-bottom:20px;
width:338px;
float:left;
margin-left:20px;
border: 1px solid #DDD;
padding-bottom:20px;
.title {
background:#f5f5f5;
padding: 5px 10px 2px 20px;
border-bottom: 1px solid #DDD;
margin-bottom: 15px;
h3 {
&:hover {
text-decoration: underline;
}
}
}
.data {
margin: 0 20px;
}
.buttons {
margin: 0 20px;
}
}
app/assets/stylesheets/ref_select.scss 0 → 100644
View file @ f0f14c8e
/** Branch/tag selector **/
.project-refs-form {
margin:0;
span {
background:none !important;
position:static !important;
width:auto !important;
height:auto !important;
}
}
.project-refs-select {
width:120px;
}
.project-refs-form .chzn-container {
position:relative;
top: -5px;
left: -11px;
.chzn-drop {
margin:7px 0;
border: 1px solid #CCC;
min-width: 300px;
.chzn-results {
max-height:300px;
}
.chzn-search input {
min-width:200px;
}
}
.chzn-single {
background:#ddd;
//border:none;
//box-shadow:none;
div {
background:transparent;
border-left:none;
}
span {
font-weight: normal;
}
}
}
app/assets/stylesheets/tree.scss
View file @ f0f14c8e
#tree-content-holder {
float:left;
width:100%;
}
#tree-readme-holder {
float:left;
width:100%;
.readme {
@include round-borders-all(4px);
padding:4px 15px;
background: #F7F7F7;
}
}
#tree-breadcrumbs { #tree-breadcrumbs {
div { div {
margin:0; margin:0;
......
app/assets/stylesheets/ui_basic.scss
View file @ f0f14c8e
/**
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
* Next items should be placed there
* - link colors
* - header styles
* - main menu styles
*
*/
.ui_basic { .ui_basic {
/*
* Common styles
*
*/
a {
color: $link_color;
&:hover {
text-decoration:none;
color: $style_color;
}
}
/* /*
* Application Header * Application Header
* *
...@@ -200,4 +223,68 @@ ...@@ -200,4 +223,68 @@
* End of Application Header * End of Application Header
* *
*/ */
/*
* Main Menu of Application
*
*/
nav.main_menu {
overflow:hidden;
border-radius: 4px;
margin: auto;
margin:30px $app_padding;
background:#eee;
border:1px solid #ccc;
height:38px;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
@include shade;
.count {
color:#aaa;
margin-left:3px;
}
.label {
background:$hover;
text-shadow:none;
color:$style_color;
}
a {
font-weight:bold;
&:first-child{
-webkit-border-top-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-topleft: 4px;
-moz-border-radius-bottomleft: 4px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
padding: 10px 25px;
display: inline-block;
color: $style_color;
border-right: 1px solid #d5d5d5;
position: relative;
box-shadow: 1px 0 0 rgba(255, 255, 255, 0.1);
margin: 0;
float:left;
text-shadow:0 1px 1px white;
&.home {
background: url(home_icon.PNG) no-repeat center center;
text-indent:-9999px;
min-width:40px;
img {
position:relative;
top:4px;
}
}
&.current {
background-color:#DDD;
}
}
}
/*
* End of Main Menu
*
*/
} }
app/assets/stylesheets/wiki.scss deleted 100644 → 0
View file @ 3a4b4fb4
p.time {
color: #999;
font-size: 90%;
margin: 30px 3px 3px 2px;
}
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