diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss deleted file mode 100644 index 3d378ee..0000000 --- a/app/assets/stylesheets/commits.css.scss +++ /dev/null @@ -1,160 +0,0 @@ -/** - * - * 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; - } -} diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1f78c6b..08eafb9 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -4,6 +4,10 @@ a { text-decoration:none; color: $style_color; } + + &.btn { + color: $style_color; + } } .vlink { @@ -97,78 +101,6 @@ a { 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 { float:left; margin-right:15px; @@ -381,3 +313,297 @@ table a code { width: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; +} diff --git a/app/assets/stylesheets/highlight.black.css.scss b/app/assets/stylesheets/highlight.black.css.scss deleted file mode 100644 index e63e08c..0000000 --- a/app/assets/stylesheets/highlight.black.css.scss +++ /dev/null @@ -1,68 +0,0 @@ -.black .highlighttable { - background: #333; - td.linenos { border:none; } - pre { color: #eee } - .highlight { background: #333; border-left:1px solid #555; } - - .hll { background-color: #ffffff } - .c { color: #888888; font-style: italic } /* Comment */ - .err { color: #a61717; background-color: #e3d2d2 } /* Error */ - .k { color: #CDA869; font-weight: bold } /* Keyword */ - .kp { color: #CDA869; font-weight: bold } /* Keyword */ - .cm { color: #888888 } /* Comment.Multiline */ - .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ - .c1 { color: #888888 } /* Comment.Single */ - .cs { color: #cc0000; font-weight: bold; background-color: transparent } /* Comment.Special */ - .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ - .ge { font-style: italic } /* Generic.Emph */ - .gr { color: #aa0000 } /* Generic.Error */ - .gh { color: #303030 } /* Generic.Heading */ - .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ - .go { color: #888888 } /* Generic.Output */ - .gp { color: #555555 } /* Generic.Prompt */ - .gs { font-weight: bold } /* Generic.Strong */ - .gu { color: #606060 } /* Generic.Subheading */ - .gt { color: #aa0000 } /* Generic.Traceback */ - .highlight .kc{font-weight:bold;} /* Keyword.Constant */ - .highlight .kd{font-weight:bold;} /* Keyword.Declaration */ - .highlight .kn{font-weight:bold;} /* Keyword.Namespace */ - .highlight .kp{font-weight:bold;} /* Keyword.Pseudo */ - .highlight .kr{font-weight:bold;} /* Keyword.Reserved */ - .highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */ - .m { color: #0000DD; font-weight: bold } /* Literal.Number */ - .p { color: #eee; } - .s { color: #dd2200; background-color: transparent } /* Literal.String */ - .highlight .na{color:#008080;} /* Name.Attribute */ - .highlight .nb{color:#0086B3;} /* Name.Builtin */ - .highlight .nc{color:#ccc;font-weight:bold;} /* Name.Class */ - .highlight .no{color:turquoise;} /* Name.Constant */ - .highlight .ni{color:#800080;} - .highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */ - .highlight .nf{color:#ccc;font-weight:bold;} /* Name.Function */ - .highlight .nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */ - .highlight .nt{color:#fc5;} /* Name.Tag */ - .highlight .nv{color:#008080;} /* Name.Variable */ - .py { color: #336699; font-weight: bold } /* Name.Property */ - .ow { color: #008800 } /* Operator.Word */ - .w { color: #bbbbbb } /* Text.Whitespace */ - .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ - .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ - .highlight .mi {color:#099;} /* Literal.Number.Integer */ - .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ - .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ - .highlight .sc{color:#d14;} /* Literal.String.Char */ - .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ - .highlight .s2{color:orange;} /* Literal.String.Double */ - .highlight .se{color:orange;} /* Literal.String.Escape */ - .highlight .sh{color:orange;} /* Literal.String.Heredoc */ - .highlight .si{color:orange;} /* Literal.String.Interpol */ - .highlight .sx{color:orange;} /* Literal.String.Other */ - .highlight .sr{color:orange;} /* Literal.String.Regex */ - .highlight .s1{color:orange;} /* Literal.String.Single */ - .highlight .ss{color:orange;} /* Literal.String.Symbol */ - .bp { color: #003388 } /* Name.Builtin.Pseudo */ - .vc { color: #336699 } /* Name.Variable.Class */ - .vg { color: #dd7700 } /* Name.Variable.Global */ - .vi { color: cyan } -} - diff --git a/app/assets/stylesheets/highlight.black.scss b/app/assets/stylesheets/highlight.black.scss new file mode 100644 index 0000000..e63e08c --- /dev/null +++ b/app/assets/stylesheets/highlight.black.scss @@ -0,0 +1,68 @@ +.black .highlighttable { + background: #333; + td.linenos { border:none; } + pre { color: #eee } + .highlight { background: #333; border-left:1px solid #555; } + + .hll { background-color: #ffffff } + .c { color: #888888; font-style: italic } /* Comment */ + .err { color: #a61717; background-color: #e3d2d2 } /* Error */ + .k { color: #CDA869; font-weight: bold } /* Keyword */ + .kp { color: #CDA869; font-weight: bold } /* Keyword */ + .cm { color: #888888 } /* Comment.Multiline */ + .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ + .c1 { color: #888888 } /* Comment.Single */ + .cs { color: #cc0000; font-weight: bold; background-color: transparent } /* Comment.Special */ + .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ + .ge { font-style: italic } /* Generic.Emph */ + .gr { color: #aa0000 } /* Generic.Error */ + .gh { color: #303030 } /* Generic.Heading */ + .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ + .go { color: #888888 } /* Generic.Output */ + .gp { color: #555555 } /* Generic.Prompt */ + .gs { font-weight: bold } /* Generic.Strong */ + .gu { color: #606060 } /* Generic.Subheading */ + .gt { color: #aa0000 } /* Generic.Traceback */ + .highlight .kc{font-weight:bold;} /* Keyword.Constant */ + .highlight .kd{font-weight:bold;} /* Keyword.Declaration */ + .highlight .kn{font-weight:bold;} /* Keyword.Namespace */ + .highlight .kp{font-weight:bold;} /* Keyword.Pseudo */ + .highlight .kr{font-weight:bold;} /* Keyword.Reserved */ + .highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */ + .m { color: #0000DD; font-weight: bold } /* Literal.Number */ + .p { color: #eee; } + .s { color: #dd2200; background-color: transparent } /* Literal.String */ + .highlight .na{color:#008080;} /* Name.Attribute */ + .highlight .nb{color:#0086B3;} /* Name.Builtin */ + .highlight .nc{color:#ccc;font-weight:bold;} /* Name.Class */ + .highlight .no{color:turquoise;} /* Name.Constant */ + .highlight .ni{color:#800080;} + .highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */ + .highlight .nf{color:#ccc;font-weight:bold;} /* Name.Function */ + .highlight .nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */ + .highlight .nt{color:#fc5;} /* Name.Tag */ + .highlight .nv{color:#008080;} /* Name.Variable */ + .py { color: #336699; font-weight: bold } /* Name.Property */ + .ow { color: #008800 } /* Operator.Word */ + .w { color: #bbbbbb } /* Text.Whitespace */ + .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ + .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ + .highlight .mi {color:#099;} /* Literal.Number.Integer */ + .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ + .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ + .highlight .sc{color:#d14;} /* Literal.String.Char */ + .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ + .highlight .s2{color:orange;} /* Literal.String.Double */ + .highlight .se{color:orange;} /* Literal.String.Escape */ + .highlight .sh{color:orange;} /* Literal.String.Heredoc */ + .highlight .si{color:orange;} /* Literal.String.Interpol */ + .highlight .sx{color:orange;} /* Literal.String.Other */ + .highlight .sr{color:orange;} /* Literal.String.Regex */ + .highlight .s1{color:orange;} /* Literal.String.Single */ + .highlight .ss{color:orange;} /* Literal.String.Symbol */ + .bp { color: #003388 } /* Name.Builtin.Pseudo */ + .vc { color: #336699 } /* Name.Variable.Class */ + .vg { color: #dd7700 } /* Name.Variable.Global */ + .vi { color: cyan } +} + diff --git a/app/assets/stylesheets/highlight.css.scss b/app/assets/stylesheets/highlight.css.scss deleted file mode 100644 index f82a9e5..0000000 --- a/app/assets/stylesheets/highlight.css.scss +++ /dev/null @@ -1,140 +0,0 @@ -@mixin round-borders-all($radius) { - border: 1px solid #eaeaea; - -moz-border-radius: $radius; - -webkit-border-radius: $radius; - border-radius: $radius; -} - -table.highlighttable -{ - margin:0px; - padding:0px; - font-size:12px; - table-layout:fixed -} - -td.code, -td.linenos{ - padding:0; - margin:0; - border-top:0; - vertical-align:top; -} - -.highlight{ - background:none; - padding:10px 0px 0px 10px; - margin-left:0px; -} - -.linenodiv pre, -.highlight pre{ - margin:0; - padding:0; - background:none; - border:none; -} - -.linenodiv pre { - white-space:pre-line; -} - -td.linenos { - /*background:#F7F7F7;*/ - color:#777; - padding:10px 0px 0px 10px; - float:left; - width:45px; - border-right: 1px solid #ccc; - -} - -td.code .highlight { - overflow: auto; -} -table.highlighttable pre{ - padding:0; - margin:0; - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; - color: #333; - text-align:left; -} - -.git-empty .highlight { - @include round-borders-all(4px); - background:#eee; - padding:5px; - //overflow-x:scroll; - pre{ - padding:0; - line-height:2.0; - margin:0; - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; - color: #333; - text-align:left;} - } - -.shadow{ - -webkit-box-shadow:0 5px 15px #000; - -moz-box-shadow:0 5px 15px #000; - box-shadow:0 5px 15px #000; -} - -.hll { background-color: #ffffff } -.c { color: #888888; font-style: italic } /* Comment */ -.err { color: #a61717; background-color: #e3d2d2 } /* Error */ -.k { color: #000000; font-weight: bold } /* Keyword */ -.cm { color: #888888 } /* Comment.Multiline */ -.cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ -.c1 { color: #888888 } /* Comment.Single */ -.cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ -.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ -.ge { font-style: italic } /* Generic.Emph */ -.gr { color: #aa0000 } /* Generic.Error */ -.gh { color: #303030 } /* Generic.Heading */ -.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ -.go { color: #888888 } /* Generic.Output */ -.gp { color: #555555 } /* Generic.Prompt */ -.gs { font-weight: bold } /* Generic.Strong */ -.gu { color: #606060 } /* Generic.Subheading */ -.gt { color: #aa0000 } /* Generic.Traceback */ -.highlight .kc{font-weight:bold;} /* Keyword.Constant */ -.highlight .kd{font-weight:bold;} /* Keyword.Declaration */ -.highlight .kn{font-weight:bold;} /* Keyword.Namespace */ -.highlight .kp{font-weight:bold;} /* Keyword.Pseudo */ -.highlight .kr{font-weight:bold;} /* Keyword.Reserved */ -.highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */ -.m { color: #0000DD; font-weight: bold } /* Literal.Number */ -.s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ -.highlight .na{color:#008080;} /* Name.Attribute */ -.highlight .nb{color:#0086B3;} /* Name.Builtin */ -.highlight .nc{color:#458;font-weight:bold;} /* Name.Class */ -.highlight .no{color:#008080;} /* Name.Constant */ -.highlight .ni{color:#800080;} -.highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */ -.highlight .nf{color:#900;font-weight:bold;} /* Name.Function */ -.highlight .nn{color:#005;font-weight:bold;} /* Name.Namespace */ -.highlight .nt{color:#000080;} /* Name.Tag */ -.highlight .nv{color:#008080;} /* Name.Variable */ -.py { color: #336699; font-weight: bold } /* Name.Property */ -.ow { color: #008800 } /* Operator.Word */ -.w { color: #bbbbbb } /* Text.Whitespace */ -.mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ -.mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ -.highlight .mi {color:#099;} /* Literal.Number.Integer */ -.mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ -.sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ -.highlight .sc{color:#d14;} /* Literal.String.Char */ -.sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ -.highlight .s2{color:#d14;} /* Literal.String.Double */ -.highlight .se{color:#d14;} /* Literal.String.Escape */ -.highlight .sh{color:#d14;} /* Literal.String.Heredoc */ -.highlight .si{color:#d14;} /* Literal.String.Interpol */ -.highlight .sx{color:#d14;} /* Literal.String.Other */ -.highlight .sr{color:#d14;} /* Literal.String.Regex */ -.highlight .s1{color:#d14;} /* Literal.String.Single */ -.highlight .ss{color:#d14;} /* Literal.String.Symbol */ -.bp { color: #003388 } /* Name.Builtin.Pseudo */ -.vc { color: #336699 } /* Name.Variable.Class */ -.vg { color: #dd7700 } /* Name.Variable.Global */ -.vi { color: #3333bb } diff --git a/app/assets/stylesheets/highlight.scss b/app/assets/stylesheets/highlight.scss new file mode 100644 index 0000000..f82a9e5 --- /dev/null +++ b/app/assets/stylesheets/highlight.scss @@ -0,0 +1,140 @@ +@mixin round-borders-all($radius) { + border: 1px solid #eaeaea; + -moz-border-radius: $radius; + -webkit-border-radius: $radius; + border-radius: $radius; +} + +table.highlighttable +{ + margin:0px; + padding:0px; + font-size:12px; + table-layout:fixed +} + +td.code, +td.linenos{ + padding:0; + margin:0; + border-top:0; + vertical-align:top; +} + +.highlight{ + background:none; + padding:10px 0px 0px 10px; + margin-left:0px; +} + +.linenodiv pre, +.highlight pre{ + margin:0; + padding:0; + background:none; + border:none; +} + +.linenodiv pre { + white-space:pre-line; +} + +td.linenos { + /*background:#F7F7F7;*/ + color:#777; + padding:10px 0px 0px 10px; + float:left; + width:45px; + border-right: 1px solid #ccc; + +} + +td.code .highlight { + overflow: auto; +} +table.highlighttable pre{ + padding:0; + margin:0; + font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; + color: #333; + text-align:left; +} + +.git-empty .highlight { + @include round-borders-all(4px); + background:#eee; + padding:5px; + //overflow-x:scroll; + pre{ + padding:0; + line-height:2.0; + margin:0; + font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; + color: #333; + text-align:left;} + } + +.shadow{ + -webkit-box-shadow:0 5px 15px #000; + -moz-box-shadow:0 5px 15px #000; + box-shadow:0 5px 15px #000; +} + +.hll { background-color: #ffffff } +.c { color: #888888; font-style: italic } /* Comment */ +.err { color: #a61717; background-color: #e3d2d2 } /* Error */ +.k { color: #000000; font-weight: bold } /* Keyword */ +.cm { color: #888888 } /* Comment.Multiline */ +.cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ +.c1 { color: #888888 } /* Comment.Single */ +.cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ +.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ +.ge { font-style: italic } /* Generic.Emph */ +.gr { color: #aa0000 } /* Generic.Error */ +.gh { color: #303030 } /* Generic.Heading */ +.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ +.go { color: #888888 } /* Generic.Output */ +.gp { color: #555555 } /* Generic.Prompt */ +.gs { font-weight: bold } /* Generic.Strong */ +.gu { color: #606060 } /* Generic.Subheading */ +.gt { color: #aa0000 } /* Generic.Traceback */ +.highlight .kc{font-weight:bold;} /* Keyword.Constant */ +.highlight .kd{font-weight:bold;} /* Keyword.Declaration */ +.highlight .kn{font-weight:bold;} /* Keyword.Namespace */ +.highlight .kp{font-weight:bold;} /* Keyword.Pseudo */ +.highlight .kr{font-weight:bold;} /* Keyword.Reserved */ +.highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */ +.m { color: #0000DD; font-weight: bold } /* Literal.Number */ +.s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ +.highlight .na{color:#008080;} /* Name.Attribute */ +.highlight .nb{color:#0086B3;} /* Name.Builtin */ +.highlight .nc{color:#458;font-weight:bold;} /* Name.Class */ +.highlight .no{color:#008080;} /* Name.Constant */ +.highlight .ni{color:#800080;} +.highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */ +.highlight .nf{color:#900;font-weight:bold;} /* Name.Function */ +.highlight .nn{color:#005;font-weight:bold;} /* Name.Namespace */ +.highlight .nt{color:#000080;} /* Name.Tag */ +.highlight .nv{color:#008080;} /* Name.Variable */ +.py { color: #336699; font-weight: bold } /* Name.Property */ +.ow { color: #008800 } /* Operator.Word */ +.w { color: #bbbbbb } /* Text.Whitespace */ +.mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ +.mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ +.highlight .mi {color:#099;} /* Literal.Number.Integer */ +.mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ +.sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ +.highlight .sc{color:#d14;} /* Literal.String.Char */ +.sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ +.highlight .s2{color:#d14;} /* Literal.String.Double */ +.highlight .se{color:#d14;} /* Literal.String.Escape */ +.highlight .sh{color:#d14;} /* Literal.String.Heredoc */ +.highlight .si{color:#d14;} /* Literal.String.Interpol */ +.highlight .sx{color:#d14;} /* Literal.String.Other */ +.highlight .sr{color:#d14;} /* Literal.String.Regex */ +.highlight .s1{color:#d14;} /* Literal.String.Single */ +.highlight .ss{color:#d14;} /* Literal.String.Symbol */ +.bp { color: #003388 } /* Name.Builtin.Pseudo */ +.vc { color: #336699 } /* Name.Variable.Class */ +.vg { color: #dd7700 } /* Name.Variable.Global */ +.vi { color: #3333bb } diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index df4b755..b124e3a 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -58,19 +58,56 @@ $hover: #FDF5D9; 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"; + +/** + * 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 "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 "notes.css.scss"; -@import "login.scss"; -/** CODE HIGHTLIGHT **/ -@import "highlight.css.scss"; -@import "highlight.black.css.scss"; +/** + * This file represent notes(comments) styles + */ +@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"; diff --git a/app/assets/stylesheets/notes.css.scss b/app/assets/stylesheets/notes.css.scss deleted file mode 100644 index b13ffcd..0000000 --- a/app/assets/stylesheets/notes.css.scss +++ /dev/null @@ -1,114 +0,0 @@ -/** Notes **/ - -#notes-list { - display:block; - list-style:none; - margin:0px; - padding:0px; -} - -.issue_notes { - .note_content { - float:left; - width:400px; - } -} - -/* Note textare */ -#note_note { - height:100px; - width:97%; - font-size:14px; -} - -#new_note { - #note_note { - height:25px; - } - .attach_holder { - display:none; - } -} - -.note .delete-note { - display:none; - float:right; -} -.note:hover .delete-note { display:block; } -.note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;} -.note img{float: left; margin-right: 10px;} -.note span.note-title{display: block;} -.note span.note-title{margin-bottom: 10px} -.note span.note-author{color: #999; font-weight: normal; font-style: italic;} -.note span.note-author strong{font-weight: bold; font-style: normal;} -.note p { color:$style_color; } -.note .note-author { color: $style_color;} - -.note .note-title { margin-left:55px; } - -p.notify_controls input{ - margin: 5px; -} - -p.notify_controls span{ - font-weight: 700; -} - -tr.line_notes_row { - border-bottom:1px solid #DDD; - &.reply { - background:#eee; - - td { - padding:7px 10px; - } - a.line_note_reply_link { - @include round-borders-all(4px); - border-color:#aaa; - background: #bbb; - padding: 3px 20px; - color: white; - } - } - ul { - margin:0; - li { - padding:0; - border:none; - } - } -} - -.line_notes_row, .per_line_form { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } - -.per_line_form { - background:#f5f5f5; - form { margin: 0; } - td { - border-bottom:1px solid #ddd; - } -} - -td .line_note_link { - position:absolute; - margin-left:-70px; - margin-top:-10px; - z-index:10; - background: url("comment_add.png") no-repeat left 0; - width:32px; - height:32px; - - opacity: 0.0; - filter: alpha(opacity=0); - - &:hover { - opacity: 1.0; - filter: alpha(opacity=100); - } -} - -.diff_file_content tr.line_holder:hover > td { background: $hover !important; } -.diff_file_content tr.line_holder:hover > td .line_note_link { - opacity: 1.0; - filter: alpha(opacity=100); -} diff --git a/app/assets/stylesheets/notes.scss b/app/assets/stylesheets/notes.scss new file mode 100644 index 0000000..68f5f22 --- /dev/null +++ b/app/assets/stylesheets/notes.scss @@ -0,0 +1,116 @@ +/** + * Notes + * + */ +#notes-list { + display:block; + list-style:none; + margin:0px; + padding:0px; +} + +.issue_notes { + .note_content { + float:left; + width:400px; + } +} + +/* Note textare */ +#note_note { + height:100px; + width:97%; + font-size:14px; +} + +#new_note { + #note_note { + height:25px; + } + .attach_holder { + display:none; + } +} + +.note .delete-note { + display:none; + float:right; +} +.note:hover .delete-note { display:block; } +.note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;} +.note img{float: left; margin-right: 10px;} +.note span.note-title{display: block;} +.note span.note-title{margin-bottom: 10px} +.note span.note-author{color: #999; font-weight: normal; font-style: italic;} +.note span.note-author strong{font-weight: bold; font-style: normal;} +.note p { color:$style_color; } +.note .note-author { color: $style_color;} + +.note .note-title { margin-left:55px; } + +p.notify_controls input{ + margin: 5px; +} + +p.notify_controls span{ + font-weight: 700; +} + +tr.line_notes_row { + border-bottom:1px solid #DDD; + &.reply { + background:#eee; + + td { + padding:7px 10px; + } + a.line_note_reply_link { + @include round-borders-all(4px); + border-color:#aaa; + background: #bbb; + padding: 3px 20px; + color: white; + } + } + ul { + margin:0; + li { + padding:0; + border:none; + } + } +} + +.line_notes_row, .per_line_form { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } + +.per_line_form { + background:#f5f5f5; + form { margin: 0; } + td { + border-bottom:1px solid #ddd; + } +} + +td .line_note_link { + position:absolute; + margin-left:-70px; + margin-top:-10px; + z-index:10; + background: url("comment_add.png") no-repeat left 0; + width:32px; + height:32px; + + opacity: 0.0; + filter: alpha(opacity=0); + + &:hover { + opacity: 1.0; + filter: alpha(opacity=100); + } +} + +.diff_file_content tr.line_holder:hover > td { background: $hover !important; } +.diff_file_content tr.line_holder:hover > td .line_note_link { + opacity: 1.0; + filter: alpha(opacity=100); +} diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss deleted file mode 100644 index b3ba1cd..0000000 --- a/app/assets/stylesheets/projects.css.scss +++ /dev/null @@ -1,254 +0,0 @@ -.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; - } -} - diff --git a/app/assets/stylesheets/ref_select.scss b/app/assets/stylesheets/ref_select.scss new file mode 100644 index 0000000..1675350 --- /dev/null +++ b/app/assets/stylesheets/ref_select.scss @@ -0,0 +1,49 @@ +/** 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; + } + } +} + diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss index d03e865..36ccbf7 100644 --- a/app/assets/stylesheets/tree.scss +++ b/app/assets/stylesheets/tree.scss @@ -1,3 +1,16 @@ +#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 { div { margin:0; diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss index d9a8845..22630bc 100644 --- a/app/assets/stylesheets/ui_basic.scss +++ b/app/assets/stylesheets/ui_basic.scss @@ -1,5 +1,28 @@ +/** + * 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 { /* + * Common styles + * + */ + a { + color: $link_color; + &:hover { + text-decoration:none; + color: $style_color; + } + } + + + /* * Application Header * */ @@ -200,4 +223,68 @@ * 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 + * + */ } diff --git a/app/assets/stylesheets/wiki.scss b/app/assets/stylesheets/wiki.scss deleted file mode 100644 index acc37b9..0000000 --- a/app/assets/stylesheets/wiki.scss +++ /dev/null @@ -1,5 +0,0 @@ -p.time { - color: #999; - font-size: 90%; - margin: 30px 3px 3px 2px; -} -- libgit2 0.21.2