[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 9cb26df web/style.less: Remove commented cruft
gitolite
ffmpeg-cvslog at ffmpeg.org
Sat Nov 8 01:59:33 CET 2014
The branch, master has been updated
via 9cb26dfa9ab71a28043513960a508d2b3e9815e9 (commit)
via b6fe66cf92263e9d5976659f231a46140eb54309 (commit)
from 5b7dcbfbdc92f71b68823ad1936b0951de1909ef (commit)
- Log -----------------------------------------------------------------
commit 9cb26dfa9ab71a28043513960a508d2b3e9815e9
Author: Timothy Gu <timothygu99 at gmail.com>
AuthorDate: Thu Nov 6 18:55:54 2014 -0800
Commit: Michael Niedermayer <michaelni at gmx.at>
CommitDate: Sat Nov 8 01:52:15 2014 +0100
web/style.less: Remove commented cruft
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
diff --git a/src/less/style.less b/src/less/style.less
index c622b4e..7de443b 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -192,13 +192,6 @@ a.well {
&:hover {
text-decoration: none;
opacity: 0.8;
- /* background-color: @Cmain; */
- /* border-color: @Csecondlight; */
- /* &.well-with-icon { */
- /* .pull-right, .pull-left { */
- /* background-color: @Csecondlight; */
- /* } */
- /* } */
}
}
commit b6fe66cf92263e9d5976659f231a46140eb54309
Author: Timothy Gu <timothygu99 at gmail.com>
AuthorDate: Thu Nov 6 18:55:53 2014 -0800
Commit: Michael Niedermayer <michaelni at gmx.at>
CommitDate: Sat Nov 8 01:51:40 2014 +0100
web/style.less: detab
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
diff --git a/src/less/style.less b/src/less/style.less
index 768d959..c622b4e 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -59,13 +59,13 @@ body, h1, h2, h3, h4, h5, h6 {
a {
color: @Csecond;
strong {
- color: @Cinvert;
+ color: @Cinvert;
}
&:hover {
- color: @Csecondlight;
- strong {
- color: @Csecond;
- }
+ color: @Csecondlight;
+ strong {
+ color: @Csecond;
+ }
}
}
@@ -84,7 +84,7 @@ h1, h2, h3, h4 {
h1, h2, h3 {
color: @Cmainlightlight;
strong {
- color: @Cinvert;
+ color: @Cinvert;
}
}
@@ -111,18 +111,18 @@ h4 {
.list-group {
.list-group-item {
- background-color: @Cmainlight;
- border-color: black;
+ background-color: @Cmainlight;
+ border-color: black;
}
&.list-group-big .list-group-item {
- padding: 25px;
+ padding: 25px;
}
a.list-group-item {
- color: @Csecondlight;
- &:hover {
- background-color: @Cmain;
- color: @Csecond;
- }
+ color: @Csecondlight;
+ &:hover {
+ background-color: @Cmain;
+ color: @Csecond;
+ }
}
}
@@ -132,73 +132,73 @@ h4 {
border-color: black;
color: @Cmainlightlight;
strong {
- color: @Cinvert;
+ color: @Cinvert;
}
code {
- background-color: @Cmain;
+ background-color: @Cmain;
}
hr {
- border-color: @Cseconddark;
+ border-color: @Cseconddark;
}
h3 {
- margin: 5px 0 15px 0;
- border: 0;
- padding: 0;
+ margin: 5px 0 15px 0;
+ border: 0;
+ padding: 0;
}
a {
- color: @Csecond;
+ color: @Csecond;
}
a.btn {
- color: white;
+ color: white;
}
small {
- display: block;
- padding: 0 10px;
- font-style: italic;
+ display: block;
+ padding: 0 10px;
+ font-style: italic;
}
&.example {
- padding-top: 40px;
- margin-bottom: 130px;
- pre {
- margin: 50px;
- margin-bottom: 30px;
- font-size: 1.5em;
- }
- .btn {
- margin-right: 50px;
- margin-bottom: 20px;
- }
+ padding-top: 40px;
+ margin-bottom: 130px;
+ pre {
+ margin: 50px;
+ margin-bottom: 30px;
+ font-size: 1.5em;
+ }
+ .btn {
+ margin-right: 50px;
+ margin-bottom: 20px;
+ }
}
&.well-with-icon {
- min-height: 136px;
- .pull-right, .pull-left {
- background-color: @Csecond;
- color: @Cinvert;
- padding: 10px;
- border-radius: 5px;
- margin: 5px;
- }
- .pull-right {
- margin-left: 20px;
- }
- .pull-left {
- margin-right: 20px;
- }
+ min-height: 136px;
+ .pull-right, .pull-left {
+ background-color: @Csecond;
+ color: @Cinvert;
+ padding: 10px;
+ border-radius: 5px;
+ margin: 5px;
+ }
+ .pull-right {
+ margin-left: 20px;
+ }
+ .pull-left {
+ margin-right: 20px;
+ }
}
}
a.well {
display: block;
&:hover {
- text-decoration: none;
- opacity: 0.8;
- /* background-color: @Cmain; */
- /* border-color: @Csecondlight; */
- /* &.well-with-icon { */
- /* .pull-right, .pull-left { */
- /* background-color: @Csecondlight; */
- /* } */
- /* } */
+ text-decoration: none;
+ opacity: 0.8;
+ /* background-color: @Cmain; */
+ /* border-color: @Csecondlight; */
+ /* &.well-with-icon { */
+ /* .pull-right, .pull-left { */
+ /* background-color: @Csecondlight; */
+ /* } */
+ /* } */
}
}
@@ -208,7 +208,7 @@ a.well {
background-color: @Cmainlight;
color: @Cinvert;
code {
- background-color: @Cmain;
+ background-color: @Cmain;
}
}
@@ -223,10 +223,10 @@ a.well {
.with-icon {
padding: 30px;
.pull-left {
- padding-right: 30px;
+ padding-right: 30px;
}
.pull-right {
- padding-left: 30px;
+ padding-left: 30px;
}
}
@@ -245,16 +245,16 @@ code {
margin: 20px 0;
border-radius: 4px;
th, td, tr {
- border: 1px solid @Cmaindarkdark;
+ border: 1px solid @Cmaindarkdark;
}
tr {
- th {
- background-color: @Cmainlight;
- border-bottom: 2px solid @Cinvert;
- }
+ th {
+ background-color: @Cmainlight;
+ border-bottom: 2px solid @Cinvert;
+ }
}
tr:nth-child(odd) {
- background-color: @Cmaindark;
+ background-color: @Cmaindark;
}
}
@@ -265,28 +265,28 @@ code {
background-color: @Cmaindarkdark;
overflow-x: hidden;
.sidebar-brand, .navbar-brand {
- img {
- opacity: 0.6;
- margin-right: 8px;
- }
- &:hover {
- color: #fff;
- img {
- opacity: 1;
- }
- }
+ img {
+ opacity: 0.6;
+ margin-right: 8px;
+ }
+ &:hover {
+ color: #fff;
+ img {
+ opacity: 1;
+ }
+ }
}
.sidebar-nav {
- li ul {
- list-style-type: none;
- padding: 0;
- li {
- line-height: 20px;
- a {
- padding-left: 20px;
- }
- }
- }
+ li ul {
+ list-style-type: none;
+ padding: 0;
+ li {
+ line-height: 20px;
+ a {
+ padding-left: 20px;
+ }
+ }
+ }
}
}
@@ -294,12 +294,12 @@ code {
height: auto;
background-color: @Cmaindark;
h1 {
- color: @Cinvert;
- display: block;
- margin: 0;
- margin-bottom: 20px;
- line-height: normal;
- border-bottom: none;
+ color: @Cinvert;
+ display: block;
+ margin: 0;
+ margin-bottom: 20px;
+ line-height: normal;
+ border-bottom: none;
}
}
@@ -309,98 +309,98 @@ code {
#download, #index {
h4 {
- margin-top: 180px;
+ margin-top: 180px;
}
h4.first {
- margin-top: 20px;
- small {
- color: inherit;
- font-size: 1em;
- }
+ margin-top: 20px;
+ small {
+ color: inherit;
+ font-size: 1em;
+ }
}
.btn-download-wrapper {
- text-align: center;
- margin: 160px auto;
- .btn {
- font-size: 3em;
- padding: 3%;
- display: inline-block;
- margin-bottom: 5px;
- }
- small {
- display: block;
- font-size: 0.4em;
- }
+ text-align: center;
+ margin: 160px auto;
+ .btn {
+ font-size: 3em;
+ padding: 3%;
+ display: inline-block;
+ margin-bottom: 5px;
+ }
+ small {
+ display: block;
+ font-size: 0.4em;
+ }
}
h2.description {
- color: @Cinvert;
- font-size: 2em;
- font-weight: bold;
- margin: 120px 50px;
- line-height: 2em;
- .label {
- font-size: 0.5em;
- }
+ color: @Cinvert;
+ font-size: 2em;
+ font-weight: bold;
+ margin: 120px 50px;
+ line-height: 2em;
+ .label {
+ font-size: 0.5em;
+ }
}
}
#download {
.btn-download-wrapper {
- margin: 40px auto;
+ margin: 40px auto;
}
.os-selector {
- text-align: center;
- color: @Cinvert;
- margin: 30px 0;
- a.btn-build {
- color: @Cinvert;
- display: block;
- padding: 20px;
- border-radius: 2px;
- }
- @linuxcolor: #e43;
- @windowscolor: #06a;
- @maccolor: darkgrey;
- .btn-build[href="#build-linux"] {
- background-color: @linuxcolor;
- &:hover {
- color: @linuxcolor;
- background-color: @Cinvert;
- }
- }
- .btn-build[href="#build-windows"] {
- background-color: @windowscolor;
- &:hover {
- color: @windowscolor;
- background-color: @Cinvert;
- }
- }
- .btn-build[href="#build-mac"] {
- background-color: @maccolor;
- &:hover {
- color: @maccolor;
- background-color: @Cinvert;
- }
- }
- .tab-content {
- margin-top: 20px;
- }
- #build-linux {
- h3 {
- color: @linuxcolor;
- }
- }
- #build-windows {
- h3 {
- color: @windowscolor;
- }
- }
- #build-mac {
- h3 {
- color: @maccolor;
- }
- }
+ text-align: center;
+ color: @Cinvert;
+ margin: 30px 0;
+ a.btn-build {
+ color: @Cinvert;
+ display: block;
+ padding: 20px;
+ border-radius: 2px;
+ }
+ @linuxcolor: #e43;
+ @windowscolor: #06a;
+ @maccolor: darkgrey;
+ .btn-build[href="#build-linux"] {
+ background-color: @linuxcolor;
+ &:hover {
+ color: @linuxcolor;
+ background-color: @Cinvert;
+ }
+ }
+ .btn-build[href="#build-windows"] {
+ background-color: @windowscolor;
+ &:hover {
+ color: @windowscolor;
+ background-color: @Cinvert;
+ }
+ }
+ .btn-build[href="#build-mac"] {
+ background-color: @maccolor;
+ &:hover {
+ color: @maccolor;
+ background-color: @Cinvert;
+ }
+ }
+ .tab-content {
+ margin-top: 20px;
+ }
+ #build-linux {
+ h3 {
+ color: @linuxcolor;
+ }
+ }
+ #build-windows {
+ h3 {
+ color: @windowscolor;
+ }
+ }
+ #build-mac {
+ h3 {
+ color: @maccolor;
+ }
+ }
}
}
@@ -412,11 +412,11 @@ footer {
border-top: 1px @Cborder solid;
padding: 20px ((100%- at Smain)/2);
a {
- display: block;
+ display: block;
}
img[alt="FFmpeg"] {
- width: 50%;
- display: block;
- margin: auto;
+ width: 50%;
+ display: block;
+ margin: auto;
}
}
-----------------------------------------------------------------------
Summary of changes:
src/less/style.less | 345 +++++++++++++++++++++++++--------------------------
1 files changed, 169 insertions(+), 176 deletions(-)
hooks/post-receive
--
More information about the ffmpeg-cvslog
mailing list