Просмотр исходного кода

Style logs, log hints and alerts in general.

Paulo Reis 8 лет назад
Родитель
Сommit
5bea196b8f

+ 11 - 11
services/web/public/stylesheets/app/editor/pdf.less

@@ -10,7 +10,7 @@
 	padding: 0 (@line-height-computed / 2);
 	padding: 0 (@line-height-computed / 2);
 }
 }
 
 
-.pdf §{
+.pdf {
 	background-color: @pdf-bg;
 	background-color: @pdf-bg;
 }
 }
 
 
@@ -183,7 +183,7 @@
 		cursor: pointer;
 		cursor: pointer;
 		.line-no {
 		.line-no {
 			float: right;
 			float: right;
-			color: @gray;
+			color: @log-line-no-color;
 			font-weight: 700;
 			font-weight: 700;
 
 
 			.fa {
 			.fa {
@@ -303,22 +303,22 @@
 		}
 		}
 
 
 		.alert-danger & {
 		.alert-danger & {
-			color: @alert-danger-border;
+			color: @state-danger-border;
 		}
 		}
 
 
 		.alert-warning & {
 		.alert-warning & {
-			color: @alert-warning-border;
+			color: @state-warning-border;
 		}
 		}
 
 
 		.alert-info & {
 		.alert-info & {
-			color: @alert-info-border;
+			color: @state-info-border;
 		}
 		}
 
 
 	}
 	}
 
 
 	&-text, 
 	&-text, 
 	&-feedback-label {
 	&-feedback-label {
-		color: @gray-dark;
+		color: @log-hints-color;
 		font-size: 0.9rem;
 		font-size: 0.9rem;
 		margin-bottom: 20px;
 		margin-bottom: 20px;
 	}
 	}
@@ -343,25 +343,25 @@
 	&-actions a,
 	&-actions a,
 	&-text a {
 	&-text a {
 		.alert-danger & {
 		.alert-danger & {
-			color: @alert-danger-text;
+			color: @state-danger-text;
 		}
 		}
 
 
 		.alert-warning & {
 		.alert-warning & {
-			color: @alert-warning-text;
+			color: @state-warning-text;
 		}
 		}
 
 
 		.alert-info & {
 		.alert-info & {
-			color: @alert-info-text;
+			color: @state-info-text;
 		}
 		}
 	}
 	}
 
 
 	&-feedback {
 	&-feedback {
-		color: @gray-dark;
+		color: @log-hints-color;
 		float: right;
 		float: right;
 	}
 	}
 
 
 	&-extra-feedback {
 	&-extra-feedback {
-		color: @gray-dark;
+		color: @log-hints-color;
 		font-size: 0.8rem;
 		font-size: 0.8rem;
 		margin-top: 10px;
 		margin-top: 10px;
 		padding-bottom: 5px;
 		padding-bottom: 5px;

+ 1 - 1
services/web/public/stylesheets/components/alerts.less

@@ -10,7 +10,7 @@
   padding: @alert-padding;
   padding: @alert-padding;
   margin-bottom: @line-height-computed;
   margin-bottom: @line-height-computed;
   border-left: 3px solid transparent;
   border-left: 3px solid transparent;
-  // border-radius: @alert-border-radius;
+  border-radius: @alert-border-radius;
 
 
   // Headings for larger alerts
   // Headings for larger alerts
   h4 {
   h4 {

+ 0 - 1
services/web/public/stylesheets/components/card.less

@@ -1,7 +1,6 @@
 .card {
 .card {
   background-color: white;
   background-color: white;
   border-radius: @border-radius-base;
   border-radius: @border-radius-base;
-  -webkit-box-shadow: @card-box-shadow;
   box-shadow: @card-box-shadow;
   box-shadow: @card-box-shadow;
   padding: @line-height-computed;
   padding: @line-height-computed;
   .page-header {
   .page-header {

+ 3 - 2
services/web/public/stylesheets/core/_common-variables.less

@@ -550,7 +550,7 @@
 //## Define alert colors, border radius, and padding.
 //## Define alert colors, border radius, and padding.
 
 
 @alert-padding:               15px;
 @alert-padding:               15px;
-@alert-border-radius:         @border-radius-base;
+@alert-border-radius:         0;
 @alert-link-font-weight:      bold;
 @alert-link-font-weight:      bold;
 
 
 @alert-success-bg:            @state-success-bg;
 @alert-success-bg:            @state-success-bg;
@@ -925,7 +925,8 @@
 @pdf-bg                          : transparent;
 @pdf-bg                          : transparent;
 @pdfjs-bg                        : @gray-lighter;
 @pdfjs-bg                        : @gray-lighter;
 @pdf-page-shadow-color           : #000;
 @pdf-page-shadow-color           : #000;
-
+@log-line-no-color               : @gray; 
+@log-hints-color                 : @gray-dark;
 // Tags
 // Tags
 @tag-border-radius  : 0.25em;
 @tag-border-radius  : 0.25em;
 @tag-bg-color       : @label-default-bg;
 @tag-bg-color       : @label-default-bg;

+ 43 - 3
services/web/public/stylesheets/core/ol-variables.less

@@ -64,6 +64,44 @@
 @btn-info-bg             : @ol-blue;
 @btn-info-bg             : @ol-blue;
 @btn-info-border         : transparent;
 @btn-info-border         : transparent;
 
 
+// Alerts
+@alert-padding : 15px;
+@alert-border-radius : @border-radius-base;
+@alert-link-font-weight : bold;
+
+@alert-success-bg    : @brand-success;
+@alert-success-text  : #FFF;
+@alert-success-border: transparent;
+
+@alert-info-bg       : @brand-info;
+@alert-info-text     : #FFF;
+@alert-info-border   : transparent;
+
+@alert-warning-bg    : @brand-warning;
+@alert-warning-text  : #FFF;
+@alert-warning-border: transparent;
+
+@alert-danger-bg     : @brand-danger;
+@alert-danger-text   : #FFF;
+@alert-danger-border : transparent;
+
+
+// @state-success-text:             darken(@brand-success, 20%);
+// @state-success-bg:               lighten(@brand-success, 50%);
+// @state-success-border:           darken(@brand-success, 5%);
+
+// @state-info-text:                darken(@brand-info, 20%);
+// @state-info-bg:                  lighten(@brand-info, 47%);
+// @state-info-border:              darken(@brand-info, 7%);
+
+// @state-warning-text:             darken(@brand-warning, 10%);
+// @state-warning-bg:               lighten(@brand-warning, 45%);
+// @state-warning-border:           @brand-warning;
+
+// @state-danger-text:              darken(@brand-danger, 10%);
+// @state-danger-bg:                lighten(@brand-danger, 50%);
+// @state-danger-border:            darken(@brand-danger, 5%);
+
 // Tags
 // Tags
 @tag-border-radius       : 9999px;
 @tag-border-radius       : 9999px;
 @tag-bg-color            : @ol-green;
 @tag-bg-color            : @ol-green;
@@ -189,9 +227,11 @@
 
 
 // PDF
 // PDF
 @pdf-top-offset                 : @toolbar-small-height;
 @pdf-top-offset                 : @toolbar-small-height;
-@pdf-bg                         : transparent;
-@pdfjs-bg                       : @ol-blue-gray-1;
+@pdf-bg                         : @ol-blue-gray-1;
+@pdfjs-bg                       : transparent;
 @pdf-page-shadow-color          : rgba(0, 0, 0, 0.5);
 @pdf-page-shadow-color          : rgba(0, 0, 0, 0.5);
+@log-line-no-color              : #FFF;
+@log-hints-color                : @ol-blue-gray-4;
 //== Colors
 //== Colors
 //
 //
 //## Gray and brand colors for use across Bootstrap.
 //## Gray and brand colors for use across Bootstrap.
@@ -213,7 +253,7 @@
 
 
 @brand-primary:         @ol-green;
 @brand-primary:         @ol-green;
 @brand-success:         @green;
 @brand-success:         @green;
-@brand-info:            @ol-dark-green;
+@brand-info:            @ol-blue;
 @brand-warning:         @orange;
 @brand-warning:         @orange;
 @brand-danger:          #E03A06;
 @brand-danger:          #E03A06;