Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistent tab indentation for all source files #2121

Merged
merged 2 commits into from
Dec 8, 2015
Merged

Consistent tab indentation for all source files #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd8a06a
LESS: Use tabs for indent in all files
nanoant Dec 7, 2015
da2585c
Indent all templates with tabs
nanoant Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions public/less/_admin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

thead {
th:last-child {
padding-right: 5px !important;
padding-right: 5px !important;
}
}
}
Expand Down Expand Up @@ -39,9 +39,9 @@
max-width: 200px;
}
}
dl.admin-dl-horizontal {
padding: 20px;

dl.admin-dl-horizontal {
padding: 20px;
margin: 0;

dd{
Expand Down
142 changes: 71 additions & 71 deletions public/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@footer-margin: 40px;

body {
font-family: 'Helvetica Neue',Arial,Helvetica,sans-serif,'微软雅黑';
background-color: #FAFAFA;
Expand All @@ -10,20 +10,20 @@ img {
pre {
font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
&.raw {
padding: 7px 12px;
margin: 10px 0;
background-color: #f8f8f8;
border: 1px solid #ddd;
border-radius: 3px;
font-size: 13px;
line-height: 1.5;
overflow: auto;
padding: 7px 12px;
margin: 10px 0;
background-color: #f8f8f8;
border: 1px solid #ddd;
border-radius: 3px;
font-size: 13px;
line-height: 1.5;
overflow: auto;
}
}
.full.height {
padding: 0;
margin: 0 0 -@footer-margin*2 0;
min-height: 100%;
margin: 0 0 -@footer-margin*2 0;
min-height: 100%;
}
.following.bar {
z-index: 900;
Expand Down Expand Up @@ -65,24 +65,24 @@ pre {
margin-right: 0;
}
.searchbox {
background-color: rgb(244, 244, 244) !important;
&:focus {
background-color: rgb(233, 233, 233) !important;
}
background-color: rgb(244, 244, 244) !important;
&:focus {
background-color: rgb(233, 233, 233) !important;
}
}
.text .octicon {
width: 16px;
text-align: center;
}
.right.menu {
.menu {
left: auto;
right: 0;
}
width: 16px;
text-align: center;
}
.right.menu {
.menu {
left: auto;
right: 0;
}
.dropdown .menu {
margin-top: 0;
}
}
}
}

.ui {
Expand All @@ -96,21 +96,21 @@ pre {
.text {
&.red {
color: #d95c5c !important;
a {
color: #d95c5c !important;
&:hover {
color: #E67777 !important;
}
}
a {
color: #d95c5c !important;
&:hover {
color: #E67777 !important;
}
}
}
&.blue {
color: #428bca !important;
a {
color: #15c !important;
&:hover {
color: #428bca !important;
}
}
a {
color: #15c !important;
&:hover {
color: #428bca !important;
}
}
}
&.black {
color: #444;
Expand All @@ -119,13 +119,13 @@ pre {
}
}
&.grey {
color: #767676 !important;
a {
color: #444 !important;
&:hover {
color: #000 !important;
}
}
color: #767676 !important;
a {
color: #444 !important;
&:hover {
color: #000 !important;
}
}
}
&.light.grey {
color: #888 !important;
Expand Down Expand Up @@ -189,10 +189,10 @@ pre {
.warning {
&.header {
background-color: #F9EDBE !important;
border-color: #F0C36D;
border-color: #F0C36D;
}
&.segment {
border-color: #F0C36D;
border-color: #F0C36D;
}
}
.info {
Expand Down Expand Up @@ -269,17 +269,17 @@ pre {
font-weight: 700;
}
&:hover {
background: rgba(0,0,0,.05);
color: rgba(0,0,0,.8);
z-index: 13;
background: rgba(0,0,0,.05);
color: rgba(0,0,0,.8);
z-index: 13;
}
}
}
}

.scrolling.menu {
.item.selected {
font-weight: 700 !important;
font-weight: 700 !important;
}
}

Expand All @@ -295,8 +295,8 @@ footer {
padding-top: 10px;
.fa {
width: 16px;
text-align: center;
color: #428bca;
text-align: center;
color: #428bca;
}
.links >* {
border-left: 1px solid #d6d6d6;
Expand All @@ -318,11 +318,11 @@ footer {

.generate-img(16);
.generate-img(@n, @i: 1) when (@i =< @n) {
.img-@{i} {
width: (2px * @i) !important;
height: (2px * @i) !important;
}
.generate-img(@n, (@i + 1));
.img-@{i} {
width: (2px * @i) !important;
height: (2px * @i) !important;
}
.generate-img(@n, (@i + 1));
}

// ensure Semantic UI .icon font family and 14px size does not apply to .icon.octicon
Expand All @@ -335,27 +335,27 @@ footer {

// Accessibility
.sr-only {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
border: 0;
}
.sr-only-focusable:active,
.sr-only-focusable:focus {
position: static;
width: auto;
height: auto;
margin: 0;
overflow: visible;
clip: auto;
position: static;
width: auto;
height: auto;
margin: 0;
overflow: visible;
clip: auto;
}

@media only screen and (max-width: 991px) and (min-width: 768px) {
.ui.container {
width: 95%;
}
}
}
36 changes: 18 additions & 18 deletions public/less/_dashboard.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
z-index: 101;
min-width: 200px;
.ui.header {
font-size: 1rem;
text-transform: none;
font-size: 1rem;
text-transform: none;
}
}
.filter.menu {
.item {
text-align: left;
.text {
height: 16px;
vertical-align: middle;
&.truncate {
vertical-align: middle;
&.truncate {
width: 85%;
}
}
Expand All @@ -32,7 +32,7 @@
// Sort
.jump.item {
margin: 1px;
padding-right: 0;
padding-right: 0;
}
.menu {
max-height: 300px;
Expand Down Expand Up @@ -96,24 +96,24 @@
padding-left: 0;

li {
&:not(:last-child) {
border-bottom: 1px solid #EAEAEA;
}
&:not(:last-child) {
border-bottom: 1px solid #EAEAEA;
}

&.private {
background-color: #fcf8e9;
}

a {
padding: 6px 1.2em;
display: block;

.octicon {
margin-right: 6px;
color: #888;
}
}
a {
padding: 6px 1.2em;
display: block;

.octicon {
margin-right: 6px;
color: #888;
}
}
}
}
}
}
}
8 changes: 4 additions & 4 deletions public/less/_emojify.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.emoji {
width: 1.5em;
height: 1.5em;
display: inline-block;
background-size: contain;
width: 1.5em;
height: 1.5em;
display: inline-block;
background-size: contain;
}
6 changes: 3 additions & 3 deletions public/less/_explore.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
}
}
.time {
font-size: 12px;
color: #808080;
font-size: 12px;
color: #808080;
}
}
}
}
2 changes: 1 addition & 1 deletion public/less/_form.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@
padding-left: 40px;
}
}
}
}
6 changes: 3 additions & 3 deletions public/less/_home.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
}
.octicon {
color: #d9453d;
font-size: 40px;
width: 50px;
font-size: 40px;
width: 50px;
}
&.header {
font-size: 20px;
Expand All @@ -36,4 +36,4 @@
.signup {
padding-top: 15px;
padding-bottom: @footer-margin * 2;
}
}
2 changes: 1 addition & 1 deletion public/less/_install.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
}
}
}
}
}
Loading