custom hex colors

newslynx · Oct 3, 2015 · 7f1039b · 7f1039b
1 parent 0d0699a
commit 7f1039b
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 2 deletions.
diff --git a/lib/public/javascripts/main.bundled.js b/lib/public/javascripts/main.bundled.js
@@ -2341,7 +2341,12 @@ views.AA_BaseSetting = Backbone.View.extend({
 			var $colorPicker = $(this);
 			$colorPicker.spectrum({
 				preferredFormat: "hex",
-				showPaletteOnly: true,
+				chooseText: "OK",
+			  showPaletteOnly: true,
+		    togglePaletteOnly: true,
+		    togglePaletteMoreText: 'More',
+		    togglePaletteLessText: 'Less',
+		    showInput: true,
 				hideAfterPaletteSelect: true,
 				palette: that.palettes[group],
 				change: function(color){

diff --git a/lib/public/javascripts/views/AA_BaseSetting.js b/lib/public/javascripts/views/AA_BaseSetting.js
@@ -235,7 +235,12 @@ views.AA_BaseSetting = Backbone.View.extend({
 			var $colorPicker = $(this);
 			$colorPicker.spectrum({
 				preferredFormat: "hex",
-				showPaletteOnly: true,
+				chooseText: "OK",
+			  showPaletteOnly: true,
+		    togglePaletteOnly: true,
+		    togglePaletteMoreText: 'More',
+		    togglePaletteLessText: 'Less',
+		    showInput: true,
 				hideAfterPaletteSelect: true,
 				palette: that.palettes[group],
 				change: function(color){

diff --git a/lib/public/stylesheets/blueprint/inputs.styl b/lib/public/stylesheets/blueprint/inputs.styl
@@ -5,6 +5,7 @@ input[type="search"]
 
 button,
 input[type="button"],
+.sp-container button,
 input.destroy
 	color #333
 	background-color #EEE

diff --git a/lib/public/stylesheets/css/approval-river.css b/lib/public/stylesheets/css/approval-river.css
diff --git a/lib/public/stylesheets/css/articles.css b/lib/public/stylesheets/css/articles.css
@@ -108,6 +108,7 @@ input[type="search"] {
 }
 button,
 input[type="button"],
+.sp-container button,
 input.destroy {
   color: #333;
   background-color: #eee;

diff --git a/lib/public/stylesheets/css/home.css b/lib/public/stylesheets/css/home.css
diff --git a/lib/public/stylesheets/css/login.css b/lib/public/stylesheets/css/login.css
diff --git a/lib/public/stylesheets/css/settings.css b/lib/public/stylesheets/css/settings.css
@@ -108,6 +108,7 @@ input[type="search"] {
 }
 button,
 input[type="button"],
+.sp-container button,
 input.destroy {
   color: #333;
   background-color: #eee;
@@ -1364,6 +1365,19 @@ button.add {
   padding-top: 10px;
   border-top: 1px solid #ccc;
 }
+.sp-cancel,
+.sp-container button {
+  font-family: Helvetica, sans-serif;
+}
+.sp-button-container {
+  margin-top: 5px;
+}
+.sp-container button {
+  font-size: 1em;
+  font-weight: bold;
+  height: 20px;
+  line-height: 7px;
+}
 .auth-container {
   display: inline-block;
   vertical-align: top;

diff --git a/lib/public/stylesheets/css/setup.css b/lib/public/stylesheets/css/setup.css
diff --git a/lib/public/stylesheets/css/submit.css b/lib/public/stylesheets/css/submit.css
diff --git a/lib/public/stylesheets/settings.styl b/lib/public/stylesheets/settings.styl
@@ -222,6 +222,16 @@ button.add
 	margin-top 10px
 	padding-top 10px
 	border-top 1px solid #ccc
+.sp-cancel,
+.sp-container button
+	font-family Helvetica, sans-serif
+.sp-button-container
+	margin-top 5px
+.sp-container button
+	font-size 1em
+	font-weight bold
+	height 20px
+	line-height 7px
 .auth-container
 	display inline-block
 	vertical-align top