Improve ui, refactor

This commit is contained in:
2016-02-07 14:49:05 +08:00
parent 34cab4ec4f
commit 8ff8b2ac6d
9 changed files with 8175 additions and 139 deletions
+7 -1
View File
@@ -17,7 +17,13 @@ change how it stems searches - done
cache to indexdb- done
hide advanced options- done
remember how many done on this ip- done
save table state - done
save setting - done
brown theme - done
add bing etc
keywordkeg
keywordkeg - hard
test:
+5 -3
View File
@@ -1,10 +1,12 @@
{
"name": "keywordshitter2",
"version": "0.0.5",
"description": "Thinking about improving keyword shitter.",
"main": "index.js",
"description": "The second generation of keyword shitter. Bigger, better, and more pungent than other products.",
"main": "public/index.html",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": "mocha",
"build-css": "lessc ./src/less/main.less > public/css/style.css",
"build": "npm run build-css"
},
"author": "",
"license": "MIT"
+6890
View File
File diff suppressed because it is too large Load Diff
View File

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 69 KiB

+14 -13
View File
@@ -5,11 +5,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap-theme.css"> -->
<link rel="stylesheet" href="theme.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">
<link rel="stylesheet" href="css/style.css">
</head>
@@ -23,24 +19,25 @@
<div class="row">
<div class="col-sm-12">
<img class="responsive" style="max-height: 75px" src="bl.png">
<img class="center-block responsive img img-responsive img-rounded" style="max-height: 8em" src="img/bl.png">
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="col-sm-12">
<div id="numofkeywords"></div>
<div class="form-group">
<label for="input" >Starting searches:</label>
<textarea id="input" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" rows="6" title="queue" class="form-control" placeholder="I accidentally
<label for="input" ><h3>Input:</h3></label>
<textarea id="input" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" rows="8" title="queue" class="form-control" placeholder="I accidentally
on purpose">I accidentally
on purpose
dismantled my
lying internet</textarea>
</div>
<a class="btn btn-info" id="startjob" onclick="StartJob();" type="button" value="Shit Keywords!">Shit Keywords!</a>
<a class="btn btn-primary" id="startjob" onclick="StartJob();" type="button" value="Shit Keywords!">Shit Keywords!</a>
<button class="btn btn-default" type="button" data-toggle="collapse" data-target="#advanced" aria-expanded="false" aria-controls="advanced">
Advanced
@@ -49,6 +46,7 @@ lying internet</textarea>
<button class="btn btn-default" type="button" data-toggle="collapse" data-target="#about" aria-expanded="false" aria-controls="about">
About
</button>
<a class="btn btn-default" id="reset" onclick="reset();" type="button" value="CleResetar">Reset</a>
<!-- </div> -->
<!-- <div class="col-sm-2"> -->
@@ -117,13 +115,15 @@ lying internet</textarea>
<div class="row">
<div class="col-sm-12">
<table id="outtable" class=" table compact dt-responsive" cellspacing="0" width="100%">
<h2>Results</h2>
<!-- <div class="table-responsive"> -->
<table id="outtable" class=" table table-condensed compact dt-responsive" cellspacing="0" width="100%">
<thead>
<tr>
<th>id</th>
<th>Keyword</th>
<th title="Keyword length">Length</th>
<th title="Searches per month">Searches</th>
<th title="Searches per month">Volume</th>
<th title="Cost per click ($US)">CPC</th>
<th title="Search">Search</th>
</tr>
@@ -132,6 +132,7 @@ lying internet</textarea>
</tbody>
</table>
<!-- </div> -->
</div>
</div>
@@ -145,7 +146,7 @@ lying internet</textarea>
<script type="text/javascript" src="https://cdn.datatables.net/s/bs/jszip-2.5.0,dt-1.10.10,b-1.1.0,b-colvis-1.1.0,b-html5-1.1.0,b-print-1.1.0,cr-1.3.0,fh-3.1.0,kt-2.1.0,r-2.0.0,se-1.1.0/datatables.min.js"></script>
<script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="js/main.js"></script>
</body>
+158 -122
View File
@@ -4,7 +4,7 @@ var numOfInitialKeywords = 0;
var doWork = false;
var keywordsToQuery = [];
var keywordsToQueryIndex = 0;
var queryflag = false;
var queryLock = false;
@@ -104,16 +104,15 @@ dbReq.onupgradeneeded = function (event) {
autoIncrement: true
});
// Create an index to search suggestions by search.
// Create an index to search suggestions by
// he query that prompted the suggestion
objectStore.createIndex("search", "search", {
unique: false
});
// and by suggestion
objectStore.createIndex("keyword", "keyword", {
unique: false
});
objectStore.createIndex("keyword", "keyword", {
unique: true
});
} else {
// objectStore = db.objectStore("customers");
@@ -123,16 +122,17 @@ dbReq.onupgradeneeded = function (event) {
window.setInterval(DoJob, 750);
function StartJob() {
if (doWork == false) {
if (doWork === false) {
keywordsToDisplay = [];
hashMapResults = {};
keywordsToQuery = [];
keywordsToQueryIndex = 0;
hashMapResults[""] = 1;
hashMapResults[" "] = 1;
hashMapResults[" "] = 1;
// hashMapResults[""] = 1;
// hashMapResults[" "] = 1;
// hashMapResults[" "] = 1;
// update config
prefixes = $('#prefixes').val().split(',');
suffixes = $('#suffixes').val().split(',');
@@ -152,7 +152,7 @@ function StartJob() {
// hashMapResults[currentx] = 1;
// }
}
numOfInitialKeywords = keywordsToDisplay.length;
numOfInitialKeywords = keywordsToQuery.length;
FilterAndDisplay();
doWork = true;
@@ -171,7 +171,7 @@ function StartJob() {
}
function DoJob() {
if (doWork === true && queryflag === false) {
if (doWork === true && queryLock === false) {
if (keywordsToQueryIndex < keywordsToQuery.length) {
var currentKw = keywordsToQuery[keywordsToQueryIndex];
if (currentKw[currentKw.length - 1] != '✓') {
@@ -179,7 +179,7 @@ function DoJob() {
}
keywordsToQueryIndex++;
} else {
if (numOfInitialKeywords != keywordsToDisplay.length) {
if (numOfInitialKeywords != keywordsToQuery.length) {
doWork = false;
$('#startjob').val('Start Job').text('Start shitting').removeClass('btn-danger');
$('#input').show();
@@ -193,63 +193,132 @@ function DoJob() {
}
}
/** Stem results and add to queue **/
function stemResults(retList, search){
/** Make permutations of results and add to queue **/
function permuteResultsToQueue(retList, search){
// stem the result and add too
// sort so the shortest is first in the queue
retList.sort(function (a, b) {
return a.length - b.length;
});
for (var i = 0; i < retList.length; i++) {
var currents = CleanVal(retList[i]);
if (!hashMapResults[currents]){
hashMapResults[currents] = 1;
// add suggestion to queue
if (currents!==search)
keywordsToQuery[keywordsToQuery.length] = currents;
// add base suggestion to queue
if (currents!==search)
keywordsToQuery[keywordsToQuery.length] = currents;
// add permutations
for (var k = 0; k < prefixes.length; k++) {
var chr = prefixes[k];
var currentx = chr + ' ' + currents;
keywordsToQuery[keywordsToQuery.length] = currentx;
hashMapResults[currentx] = 1;
}
for (var j = 0; j < prefixes.length; j++) {
var chr = prefixes[j];
var currentx = currents + ' ' + chr;
keywordsToQuery[keywordsToQuery.length] = currentx;
hashMapResults[currentx] = 1;
// add prefix permutations
for (var k = 0; k < prefixes.length; k++) {
var chr = prefixes[k];
var currentx = chr + ' ' + currents;
keywordsToQuery[keywordsToQuery.length] = currentx;
hashMapResults[currentx] = 1;
}
// add suffix permutations
for (var j = 0; j < prefixes.length; j++) {
var chr = prefixes[j];
var currentx = currents + ' ' + chr;
keywordsToQuery[keywordsToQuery.length] = currentx;
hashMapResults[currentx] = 1;
}
}
}
}
/** Display results **/
function displayResults(retList, search){
for (var i = 0; i < retList.length; i++) {
var cleanKw = CleanVal(retList[i]);
// display
table.row.add([
table.rows()[0].length,
cleanKw,
cleanKw.length,
undefined,
undefined,
search]);
}
table.draw(false);
// FilterAndDisplay();
//
// var textarea = document.getElementById("input");
// textarea.scrollTop = textarea.scrollHeight;
//
}
/** Store new results in db and hashmap **/
function storeResults(retList, search, url){
for (var i = 0; i < retList.length; i++) {
var cleanKw = CleanVal(retList[i]);
// TODO check if I should add in bulk?
// add to db
var transaction = db.transaction(["suggestions"], "readwrite");
transaction.onerror = errorHandler;
var objectStore = transaction.objectStore("suggestions");
addReq = objectStore.add({
keyword: cleanKw,
Length: cleanKw.length,
search: search,
ip: myIp,
url: this.url,
time: (new Date()).toUTCString()
});
addReq.onerror=errorHandler;
}
}
/** mark a search as done in the queue **/
function markAsDone(search){
// mark as done in queue
var found=false;
for (var l = 0; l < keywordsToQuery.length; l++) {
if (keywordsToQuery[l]==search){
keywordsToQuery[l]+=' ✓';
found=true;
break;
}
}
if (!found){console.error('Did not find ', search, 'in queue');}
}
/** Get search suggestions for a keyword **/
function QueryKeyword(keyword) {
var querykeyword = keyword;
function QueryKeyword(search) {
var querykeyword = search;
var queryresult = '';
queryflag = true; // wait for this worker
queryLock = true;
// first check in db
var reqObj = db.transaction(["suggestions"],"readonly").
objectStore("suggestions")
.index("search")
.getAll(keyword)
.getAll(search)
.onsuccess = function(e) {
console.log(e.target.result);
if ('already exists', e.target.results){
// TODO add
// console.log(e.target.result);
if (e.target.result){
// search was done previously so display results from db
var retList = [];
for (var i = 0; i < e.target.result.length; i++) {
retList.push(e.target.result[i].keyword);
}
displayResults(retList,search);
permuteResultsToQueue(retList);
}
else {
// search not done, lets do the query
$.ajax({
url: "http://suggestqueries.google.com/complete/search",
jsonp: "jsonp",
dataType: "jsonp",
data: {
q: querykeyword,
q: search,
client: "chrome"
},
success: function (res, statusText, jqXHR) {
@@ -257,66 +326,12 @@ function QueryKeyword(keyword) {
var retList = res[1];
var char, currentx;
storeResults(retList, search, this.url);
displayResults(retList, search);
permuteResultsToQueue(retList);
markAsDone(search);
// store results
for (var i = 0; i < retList.length; i++) {
var currents = CleanVal(retList[i]);
if (hashMapResults[currents] != 1) {
hashMapResults[currents] = 1;
var cleanKw = CleanVal(retList[i]);
// display
table.row.add([
table.rows()[0].length,
cleanKw,
cleanKw.length,
undefined,
undefined,
search])
.draw(false);
// add to db
var transaction = db.transaction(["suggestions"], "readwrite");
transaction.onerror = errorHandler;
var objectStore = transaction.objectStore("suggestions");
addReq = objectStore.add({
Keyword: cleanKw,
Length: cleanKw.length,
search: search,
ip: myIp,
url: this.url,
time: (new Date()).toUTCString()
});
addReq.onerror=errorHandler;
}
}
stemResults(retList);
// now remove from the queue
// FIXME oh wait but that mean it progress up th queue by 2 instead of one
var found=false;
for (var l = 0; l < keywordsToQuery.length; l++) {
if (keywordsToQuery[l]==search){
// keywordsToQuery.splice(l,1);
keywordsToQuery[l]+=' ✓';
found=true;
break;
}
}
if (!found){console.error('Did not find ', search, 'in queue');}
// table.draw();
// FilterAndDisplay();
//
// var textarea = document.getElementById("input");
// textarea.scrollTop = textarea.scrollHeight;
//
queryflag = false;
queryLock = false;
}
});
@@ -346,6 +361,7 @@ function CleanVal(input) {
return val;
}
/** TODO get this working **/
function Filter(listToFilter) {
var retList = listToFilter;
@@ -407,11 +423,11 @@ function FilterAndDisplay() {
sb += '\n';
}
document.getElementById("input").value = sb;
document.getElementById("numofkeywords").innerHTML = '' + outputKeywords.length + ' : ' + keywordsToDisplay.length;
document.getElementById("numofkeywords").innerHTML = '' + outputKeywords.length + ' : ' + keywordsToQuery.length;
}
/** TODO Try to fetch cpc and volume if users have kwkeg installed **/
function get_kwkeg(){
var kws = table
.data()
@@ -432,18 +448,15 @@ function get_kwkeg(){
data[i];
}
});
}
// function FilterIfNotWorking() {
// if (doWork == false) {
// FilterAndDisplay();
// }
// }
/** read settings from webpage **/
function readSettings(){
//set options from localstorage and watch for changes
}
/** load settings from localStorage **/
function loadSettings(){
// TODO do table settings as well, e.g. column visibilitity
if (localStorage.service) $("#service").val( localStorage.service );
if (localStorage.filterNegative) $("#filter-negative").val( localStorage.filterNegative );
if (localStorage.filterPositive) $("#filter-positive").val( localStorage.filterPositive );
@@ -453,6 +466,7 @@ function loadSettings(){
if (localStorage.suffixes) $("#suffixes").val( localStorage.suffixes );
}
/** save settings to localStorage. **/
function saveSettings(){
localStorage.service = $('#service').val();
localStorage.filterNegative = $('#filter-negative').val();
@@ -462,6 +476,12 @@ function saveSettings(){
localStorage.prefixes = $('#prefixes').val();
localStorage.suffixes = $('#suffixes').val();
}
function reset(){
table.clear();
table.draw();
$('#input').val('');
saveSettings();
}
$(document).ready(function () {
@@ -475,28 +495,44 @@ $(document).ready(function () {
pageLength: 25,
// bAutoWidth: false,
// dom: 'lfrtipB',
dom: "<'row'<'col-sm-3'B><'col-sm-6'i><'col-sm-3'f>>" +
"<'row'<'col-sm-12'tr>>" +
"<'row'<'col-sm-4'B><'col-sm-5'p><'col-sm-3'l>>",
buttons: ['copyHtml5', 'csvHtml5'],
"columnDefs": [{
"name": "keyword",
"targets": 0
dom:
"<'row'<'col-sm-5'B><'col-sm-7'<'pull-right'p>>>" +
"<'row'<'col-sm-8'i><'col-sm-4'<'pull-right'f>>>" +
// "<'row'<'col-sm-4'><'col-sm-1'>>"+
"<'row'<'col-sm-12'tr>>",
buttons: ['copyHtml5', 'csvHtml5','colvis','pageLength'],
"columnDefs": [
{
"name": "id",
"targets": 0,
"visible": false,
}, {
"name": "length",
"name": "keyword",
"targets": 1
}, {
"name": "length",
"targets": 2,
"visible": false,
}, {
"name": "volume",
"targets": 2
"targets": 3,
"visible": false,
}, {
"name": "cpc",
"targets": 3
"targets": 4,
"visible": false,
}, {
"name": "search",
"targets": 4
"targets": 5,
"visible": false,
}],
ordering: [[ 0, 'dec' ]],
colReorder: {},
stateSave: true
// aaSorting: [],
// data: keywordsToDisplay
// select: {
// style: 'os'
// }
});
table.order([ 0, 'dec' ]);
});
+174
View File
@@ -0,0 +1,174 @@
// Simplex 3.3.5
// Bootswatch
// -----------------------------------------------------
@web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700";
.web-font(@path) {
@import url("@{path}");
}
.web-font(@web-font-path);
.btn-shadow(@color) {
#gradient > .vertical-three-colors(lighten(@color, 3%), @color, 6%, darken(@color, 3%));
filter: none;
border: 1px solid darken(@color, 10%);
}
// Navbar =====================================================================
.navbar {
&-inverse {
.badge {
background-color: #fff;
color: @brand-primary;
}
}
}
// Buttons ====================================================================
.btn {
font-family: @headings-font-family;
}
.btn-default,
.btn-default:hover {
.btn-shadow(@btn-default-bg);
}
.btn-primary,
.btn-primary:hover {
.btn-shadow(@btn-primary-bg);
}
.btn-success,
.btn-success:hover {
.btn-shadow(@btn-success-bg);
}
.btn-info,
.btn-info:hover {
.btn-shadow(@btn-info-bg);
}
.btn-warning,
.btn-warning:hover {
.btn-shadow(@btn-warning-bg);
}
.btn-danger,
.btn-danger:hover {
.btn-shadow(@btn-danger-bg);
}
// Typography =================================================================
body {
font-weight: 200;
}
// Tables =====================================================================
th {
color: @headings-color;
}
// Forms ======================================================================
legend {
color: @headings-color;
}
label {
font-weight: normal;
}
.has-warning {
.help-block,
.control-label,
.radio,
.checkbox,
.radio-inline,
.checkbox-inline,
&.radio label,
&.checkbox label,
&.radio-inline label,
&.checkbox-inline label,
.form-control-feedback {
color: @brand-danger;
}
.form-control,
.form-control:focus {
border-color: @brand-danger;
}
}
.has-error {
.help-block,
.control-label,
.radio,
.checkbox,
.radio-inline,
.checkbox-inline,
&.radio label,
&.checkbox label,
&.radio-inline label,
&.checkbox-inline label,
.form-control-feedback {
color: @brand-primary;
}
.form-control,
.form-control:focus {
border-color: @brand-primary;
}
}
.has-success {
.help-block,
.control-label,
.radio,
.checkbox,
.radio-inline,
.checkbox-inline,
&.radio label,
&.checkbox label,
&.radio-inline label,
&.checkbox-inline label,
.form-control-feedback {
color: @brand-success;
}
.form-control,
.form-control:focus {
border-color: @brand-success;
}
}
// Navs =======================================================================
.pager {
a {
color: @headings-color;
}
a:hover,
.active > a, {
border-color: @brand-primary;
color: #fff;
}
.disabled > a {
border-color: @pager-border;
}
}
// Indicators =================================================================
// Progress bars ==============================================================
// Containers =================================================================
+869
View File
@@ -0,0 +1,869 @@
// Simplex 3.3.6
// Variables
// --------------------------------------------------
//== Colors
//
//## Gray and brand colors for use across Bootstrap.
@gray-base: #000;
@gray-darker: lighten(@gray-base, 13.5%); // #222
@gray-dark: #444;
@gray: #777;
@gray-light: #808080;
@gray-lighter: #ddd;
@brand-primary: #D9230F;
@brand-success: #469408;
@brand-info: #029ACF;
@brand-warning: #9B479F;
@brand-danger: #D9831F;
//== Scaffolding
//
//## Settings for some of the most global styles.
//** Background color for `<body>`.
@body-bg: #FCFCFC;
//** Global text color on `<body>`.
@text-color: @gray;
//** Global textual link color.
@link-color: @brand-primary;
//** Link hover color set via `darken()` function.
@link-hover-color: darken(@link-color, 15%);
//** Link hover decoration.
@link-hover-decoration: underline;
//== Typography
//
//## Font, line-height, and color for body text, headings, and more.
@font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 13px;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
@font-size-h5: @font-size-base;
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
//** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
//** By default, this inherits from the `<body>`.
@headings-font-family: @font-family-sans-serif;
@headings-font-weight: 300;
@headings-line-height: 1.1;
@headings-color: @gray-dark;
//== Iconography
//
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
@icon-font-path: "../fonts/";
//** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular";
//** Element ID within SVG icon file.
@icon-font-svg-id: "glyphicons_halflingsregular";
//== Components
//
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 8px;
@padding-base-horizontal: 12px;
@padding-large-vertical: 14px;
@padding-large-horizontal: 16px;
@padding-small-vertical: 5px;
@padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
@line-height-small: 1.5;
@border-radius-base: 4px;
@border-radius-large: 6px;
@border-radius-small: 3px;
//** Global color for active items (e.g., navs or dropdowns).
@component-active-color: #fff;
//** Global background color for active items (e.g., navs or dropdowns).
@component-active-bg: @brand-primary;
//** Width of the `border` for generating carets that indicator dropdowns.
@caret-width-base: 4px;
//** Carets increase slightly in size for larger components.
@caret-width-large: 5px;
//== Tables
//
//## Customizes the `.table` component with basic values, each used across all table variations.
//** Padding for `<th>`s and `<td>`s.
@table-cell-padding: 8px;
//** Padding for cells in `.table-condensed`.
@table-condensed-cell-padding: 5px;
//** Default background color used for all tables.
@table-bg: transparent;
//** Background color used for `.table-striped`.
@table-bg-accent: #f9f9f9;
//** Background color used for `.table-hover`.
@table-bg-hover: #f5f5f5;
@table-bg-active: @table-bg-hover;
//** Border color for table and cell borders.
@table-border-color: #ddd;
//== Buttons
//
//## For each of Bootstrap's buttons, define text, background and border color.
@btn-font-weight: normal;
@btn-default-color: #fff;
@btn-default-bg: #474949;
@btn-default-border: @btn-default-bg;
@btn-primary-color: @btn-default-color;
@btn-primary-bg: @brand-primary;
@btn-primary-border: @btn-primary-bg;
@btn-success-color: @btn-default-color;
@btn-success-bg: @brand-success;
@btn-success-border: @btn-success-bg;
@btn-info-color: @btn-default-color;
@btn-info-bg: @brand-info;
@btn-info-border: @btn-info-bg;
@btn-warning-color: @btn-default-color;
@btn-warning-bg: @brand-warning;
@btn-warning-border: @btn-warning-bg;
@btn-danger-color: @btn-default-color;
@btn-danger-bg: @brand-danger;
@btn-danger-border: @btn-danger-bg;
@btn-link-disabled-color: @gray-light;
// Allows for customizing button radius independently from global border radius
@btn-border-radius-base: @border-radius-base;
@btn-border-radius-large: @border-radius-large;
@btn-border-radius-small: @border-radius-small;
//== Forms
//
//##
//** `<input>` background color
@input-bg: #fff;
//** `<input disabled>` background color
@input-bg-disabled: @gray-lighter;
//** Text color for `<input>`s
@input-color: @text-color;
//** `<input>` border color
@input-border: #ddd;
// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
//** Default `.form-control` border radius
// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
@input-border-radius: @border-radius-base;
//** Large `.form-control` border radius
@input-border-radius-large: @border-radius-large;
//** Small `.form-control` border radius
@input-border-radius-small: @border-radius-small;
//** Border color for inputs on focus
@input-border-focus: #66afe9;
//** Placeholder text color
@input-color-placeholder: @gray-lighter;
//** Default `.form-control` height
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
//** Large `.form-control` height
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
//** Small `.form-control` height
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
//** `.form-group` margin
@form-group-margin-bottom: 15px;
@legend-color: @text-color;
@legend-border-color: #e5e5e5;
//** Background color for textual input addons
@input-group-addon-bg: @gray-lighter;
//** Border color for textual input addons
@input-group-addon-border-color: @input-border;
//** Disabled cursor for form controls and buttons.
@cursor-disabled: not-allowed;
//== Dropdowns
//
//## Dropdown menu container and contents.
//** Background for the dropdown menu.
@dropdown-bg: #fff;
//** Dropdown menu `border-color`.
@dropdown-border: rgba(0,0,0,.15);
//** Dropdown menu `border-color` **for IE8**.
@dropdown-fallback-border: #ccc;
//** Divider color for between dropdown items.
@dropdown-divider-bg: #e5e5e5;
//** Dropdown link text color.
@dropdown-link-color: @gray-dark;
//** Hover color for dropdown links.
@dropdown-link-hover-color: #fff;
//** Hover background for dropdown links.
@dropdown-link-hover-bg: @component-active-bg;
//** Active dropdown menu item text color.
@dropdown-link-active-color: #fff;
//** Active dropdown menu item background color.
@dropdown-link-active-bg: @component-active-bg;
//** Disabled dropdown menu item background color.
@dropdown-link-disabled-color: @gray-light;
//** Text color for headers within dropdown menus.
@dropdown-header-color: @gray-light;
//** Deprecated `@dropdown-caret-color` as of v3.1.0
@dropdown-caret-color: #000;
//-- Z-index master list
//
// Warning: Avoid customizing these values. They're used for a bird's eye view
// of components dependent on the z-axis and are designed to all work together.
//
// Note: These variables are not generated into the Customizer.
@zindex-navbar: 1000;
@zindex-dropdown: 1000;
@zindex-popover: 1060;
@zindex-tooltip: 1070;
@zindex-navbar-fixed: 1030;
@zindex-modal-background: 1040;
@zindex-modal: 1050;
//== Media queries breakpoints
//
//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
// Extra small screen / phone
//** Deprecated `@screen-xs` as of v3.0.1
@screen-xs: 480px;
//** Deprecated `@screen-xs-min` as of v3.2.0
@screen-xs-min: @screen-xs;
//** Deprecated `@screen-phone` as of v3.0.1
@screen-phone: @screen-xs-min;
// Small screen / tablet
//** Deprecated `@screen-sm` as of v3.0.1
@screen-sm: 768px;
@screen-sm-min: @screen-sm;
//** Deprecated `@screen-tablet` as of v3.0.1
@screen-tablet: @screen-sm-min;
// Medium screen / desktop
//** Deprecated `@screen-md` as of v3.0.1
@screen-md: 992px;
@screen-md-min: @screen-md;
//** Deprecated `@screen-desktop` as of v3.0.1
@screen-desktop: @screen-md-min;
// Large screen / wide desktop
//** Deprecated `@screen-lg` as of v3.0.1
@screen-lg: 1200px;
@screen-lg-min: @screen-lg;
//** Deprecated `@screen-lg-desktop` as of v3.0.1
@screen-lg-desktop: @screen-lg-min;
// So media queries don't overlap when required, provide a maximum
@screen-xs-max: (@screen-sm-min - 1);
@screen-sm-max: (@screen-md-min - 1);
@screen-md-max: (@screen-lg-min - 1);
//== Grid system
//
//## Define your custom responsive grid.
//** Number of columns in the grid.
@grid-columns: 12;
//** Padding between columns. Gets divided in half for the left and right.
@grid-gutter-width: 30px;
// Navbar collapse
//** Point at which the navbar becomes uncollapsed.
@grid-float-breakpoint: @screen-sm-min;
//** Point at which the navbar begins collapsing.
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
//== Container sizes
//
//## Define the maximum width of `.container` for different screen sizes.
// Small screen / tablet
@container-tablet: (720px + @grid-gutter-width);
//** For `@screen-sm-min` and up.
@container-sm: @container-tablet;
// Medium screen / desktop
@container-desktop: (940px + @grid-gutter-width);
//** For `@screen-md-min` and up.
@container-md: @container-desktop;
// Large screen / wide desktop
@container-large-desktop: (1140px + @grid-gutter-width);
//** For `@screen-lg-min` and up.
@container-lg: @container-large-desktop;
//== Navbar
//
//##
// Basics of a navbar
@navbar-height: 40px;
@navbar-margin-bottom: @line-height-computed;
@navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
@navbar-collapse-max-height: 340px;
@navbar-default-color: @gray;
@navbar-default-bg: #fff;
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
// Navbar links
@navbar-default-link-color: @gray;
@navbar-default-link-hover-color: @brand-primary;
@navbar-default-link-hover-bg: transparent;
@navbar-default-link-active-color: @navbar-default-link-hover-color;
@navbar-default-link-active-bg: transparent;
@navbar-default-link-disabled-color: #444;
@navbar-default-link-disabled-bg: transparent;
// Navbar brand label
@navbar-default-brand-color: @navbar-default-link-color;
@navbar-default-brand-hover-color: @navbar-default-link-hover-color;
@navbar-default-brand-hover-bg: transparent;
// Navbar toggle
@navbar-default-toggle-hover-bg: #ddd;
@navbar-default-toggle-icon-bar-bg: #ccc;
@navbar-default-toggle-border-color: #ddd;
//=== Inverted navbar
// Reset inverted navbar basics
@navbar-inverse-color: lighten(@brand-primary, 40%);
@navbar-inverse-bg: @brand-primary;
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links
@navbar-inverse-link-color: lighten(@brand-primary, 40%);
@navbar-inverse-link-hover-color: #fff;
@navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
@navbar-inverse-link-active-bg: transparent;
@navbar-inverse-link-disabled-color: #ccc;
@navbar-inverse-link-disabled-bg: transparent;
// Inverted navbar brand label
@navbar-inverse-brand-color: @navbar-inverse-link-color;
@navbar-inverse-brand-hover-color: #fff;
@navbar-inverse-brand-hover-bg: transparent;
// Inverted navbar toggle
@navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%);
@navbar-inverse-toggle-icon-bar-bg: #fff;
@navbar-inverse-toggle-border-color: darken(@navbar-inverse-bg, 10%);
//== Navs
//
//##
//=== Shared nav styles
@nav-link-padding: 10px 15px;
@nav-link-hover-bg: @gray-lighter;
@nav-disabled-link-color: @gray-light;
@nav-disabled-link-hover-color: @gray-light;
//== Tabs
@nav-tabs-border-color: #ddd;
@nav-tabs-link-hover-border-color: @gray-lighter;
@nav-tabs-active-link-hover-bg: @body-bg;
@nav-tabs-active-link-hover-color: @gray;
@nav-tabs-active-link-hover-border-color: #ddd;
@nav-tabs-justified-link-border-color: #ddd;
@nav-tabs-justified-active-link-border-color: @body-bg;
//== Pills
@nav-pills-border-radius: @border-radius-base;
@nav-pills-active-link-hover-bg: @component-active-bg;
@nav-pills-active-link-hover-color: @component-active-color;
//== Pagination
//
//##
@pagination-color: @headings-color;
@pagination-bg: #fff;
@pagination-border: #ddd;
@pagination-hover-color: #fff;
@pagination-hover-bg: @brand-primary;
@pagination-hover-border: @brand-primary;
@pagination-active-color: #fff;
@pagination-active-bg: @brand-primary;
@pagination-active-border: @brand-primary;
@pagination-disabled-color: @gray-lighter;
@pagination-disabled-bg: #fff;
@pagination-disabled-border: #ddd;
//== Pager
//
//##
@pager-bg: @pagination-bg;
@pager-border: @pagination-border;
@pager-border-radius: 15px;
@pager-hover-bg: @brand-primary;
@pager-active-bg: @brand-primary;
@pager-active-color: #fff;
@pager-disabled-color: @gray-lighter;
//== Jumbotron
//
//##
@jumbotron-padding: 30px;
@jumbotron-color: inherit;
@jumbotron-bg: darken(@body-bg, 3%);
@jumbotron-heading-color: inherit;
@jumbotron-font-size: ceil((@font-size-base * 1.5));
@jumbotron-heading-font-size: ceil((@font-size-base * 4.5));
//== Form states and alerts
//
//## Define colors for form feedback states and, by default, alerts.
@state-success-text: #468847;
@state-success-bg: #dff0d8;
@state-success-border: darken(spin(@state-success-bg, -10), 5%);
@state-info-text: #3a87ad;
@state-info-bg: #d9edf7;
@state-info-border: darken(spin(@state-info-bg, -10), 7%);
@state-warning-text: #c09853;
@state-warning-bg: #fcf8e3;
@state-warning-border: darken(spin(@state-warning-bg, -10), 3%);
@state-danger-text: #b94a48;
@state-danger-bg: #f2dede;
@state-danger-border: darken(spin(@state-danger-bg, -10), 3%);
//== Tooltips
//
//##
//** Tooltip max width
@tooltip-max-width: 200px;
//** Tooltip text color
@tooltip-color: #fff;
//** Tooltip background color
@tooltip-bg: #000;
@tooltip-opacity: .9;
//** Tooltip arrow width
@tooltip-arrow-width: 5px;
//** Tooltip arrow color
@tooltip-arrow-color: @tooltip-bg;
//== Popovers
//
//##
//** Popover body background color
@popover-bg: #fff;
//** Popover maximum width
@popover-max-width: 276px;
//** Popover border color
@popover-border-color: rgba(0,0,0,.2);
//** Popover fallback border color
@popover-fallback-border-color: #ccc;
//** Popover title background color
@popover-title-bg: darken(@popover-bg, 3%);
//** Popover arrow width
@popover-arrow-width: 10px;
//** Popover arrow color
@popover-arrow-color: @popover-bg;
//** Popover outer arrow width
@popover-arrow-outer-width: (@popover-arrow-width + 1);
//** Popover outer arrow color
@popover-arrow-outer-color: fadein(@popover-border-color, 5%);
//** Popover outer arrow fallback color
@popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%);
//== Labels
//
//##
//** Default label background color
@label-default-bg: @btn-default-bg;
//** Primary label background color
@label-primary-bg: @brand-primary;
//** Success label background color
@label-success-bg: @brand-success;
//** Info label background color
@label-info-bg: @brand-info;
//** Warning label background color
@label-warning-bg: @brand-warning;
//** Danger label background color
@label-danger-bg: @brand-danger;
//** Default label text color
@label-color: #fff;
//** Default text color of a linked label
@label-link-hover-color: #fff;
//== Modals
//
//##
//** Padding applied to the modal body
@modal-inner-padding: 20px;
//** Padding applied to the modal title
@modal-title-padding: 15px;
//** Modal title line-height
@modal-title-line-height: @line-height-base;
//** Background color of modal content area
@modal-content-bg: #fff;
//** Modal content border color
@modal-content-border-color: rgba(0,0,0,.2);
//** Modal content border color **for IE8**
@modal-content-fallback-border-color: #999;
//** Modal backdrop background color
@modal-backdrop-bg: #000;
//** Modal backdrop opacity
@modal-backdrop-opacity: .5;
//** Modal header border color
@modal-header-border-color: #e5e5e5;
//** Modal footer border color
@modal-footer-border-color: @modal-header-border-color;
@modal-lg: 900px;
@modal-md: 600px;
@modal-sm: 300px;
//== Alerts
//
//## Define alert colors, border radius, and padding.
@alert-padding: 15px;
@alert-border-radius: @border-radius-base;
@alert-link-font-weight: bold;
@alert-success-bg: @state-success-bg;
@alert-success-text: @state-success-text;
@alert-success-border: @state-success-border;
@alert-info-bg: @state-info-bg;
@alert-info-text: @state-info-text;
@alert-info-border: @state-info-border;
@alert-warning-bg: @state-warning-bg;
@alert-warning-text: @state-warning-text;
@alert-warning-border: @state-warning-border;
@alert-danger-bg: @state-danger-bg;
@alert-danger-text: @state-danger-text;
@alert-danger-border: @state-danger-border;
//== Progress bars
//
//##
//** Background color of the whole progress component
@progress-bg: #f5f5f5;
//** Progress bar text color
@progress-bar-color: #fff;
//** Variable for setting rounded corners on progress bar.
@progress-border-radius: @border-radius-base;
//** Default progress bar color
@progress-bar-bg: @brand-primary;
//** Success progress bar color
@progress-bar-success-bg: @brand-success;
//** Warning progress bar color
@progress-bar-warning-bg: @brand-warning;
//** Danger progress bar color
@progress-bar-danger-bg: @brand-danger;
//** Info progress bar color
@progress-bar-info-bg: @brand-info;
//== List group
//
//##
//** Background color on `.list-group-item`
@list-group-bg: #fff;
//** `.list-group-item` border color
@list-group-border: #ddd;
//** List group border radius
@list-group-border-radius: @border-radius-base;
//** Background color of single list items on hover
@list-group-hover-bg: #f5f5f5;
//** Text color of active list items
@list-group-active-color: @component-active-color;
//** Background color of active list items
@list-group-active-bg: @component-active-bg;
//** Border color of active list elements
@list-group-active-border: @list-group-active-bg;
//** Text color for content within active list items
@list-group-active-text-color: lighten(@list-group-active-bg, 40%);
//** Text color of disabled list items
@list-group-disabled-color: @gray-light;
//** Background color of disabled list items
@list-group-disabled-bg: @gray-lighter;
//** Text color for content within disabled list items
@list-group-disabled-text-color: @list-group-disabled-color;
@list-group-link-color: #555;
@list-group-link-hover-color: @list-group-link-color;
@list-group-link-heading-color: #333;
//== Panels
//
//##
@panel-bg: #fff;
@panel-body-padding: 15px;
@panel-heading-padding: 10px 15px;
@panel-footer-padding: @panel-heading-padding;
@panel-border-radius: @border-radius-base;
//** Border color for elements within panels
@panel-inner-border: #ddd;
@panel-footer-bg: @body-bg;
@panel-default-text: @gray-dark;
@panel-default-border: #ddd;
@panel-default-heading-bg: @panel-footer-bg;
@panel-primary-text: #fff;
@panel-primary-border: @brand-primary;
@panel-primary-heading-bg: @brand-primary;
@panel-success-text: #fff;
@panel-success-border: @brand-success;
@panel-success-heading-bg: @brand-success;
@panel-info-text: #fff;
@panel-info-border: @brand-info;
@panel-info-heading-bg: @brand-info;
@panel-warning-text: #fff;
@panel-warning-border: @brand-warning;
@panel-warning-heading-bg: @brand-warning;
@panel-danger-text: #fff;
@panel-danger-border: @brand-danger;
@panel-danger-heading-bg: @brand-danger;
//== Thumbnails
//
//##
//** Padding around the thumbnail image
@thumbnail-padding: 4px;
//** Thumbnail background color
@thumbnail-bg: @body-bg;
//** Thumbnail border color
@thumbnail-border: #ddd;
//** Thumbnail border radius
@thumbnail-border-radius: @border-radius-base;
//** Custom text color for thumbnail captions
@thumbnail-caption-color: @text-color;
//** Padding around the thumbnail caption
@thumbnail-caption-padding: 9px;
//== Wells
//
//##
@well-bg: darken(@body-bg, 3%);
@well-border: darken(@well-bg, 7%);
//== Badges
//
//##
@badge-color: #fff;
//** Linked badge text color on hover
@badge-link-hover-color: #fff;
@badge-bg: @link-color;
//** Badge text color in active nav link
@badge-active-color: @link-color;
//** Badge background color in active nav link
@badge-active-bg: #fff;
@badge-font-weight: bold;
@badge-line-height: 1;
@badge-border-radius: 10px;
//== Breadcrumbs
//
//##
@breadcrumb-padding-vertical: 8px;
@breadcrumb-padding-horizontal: 15px;
//** Breadcrumb background color
@breadcrumb-bg: transparent;
//** Breadcrumb text color
@breadcrumb-color: #ccc;
//** Text color of current page in the breadcrumb
@breadcrumb-active-color: @gray-light;
//** Textual separator for between breadcrumb elements
@breadcrumb-separator: "/";
//== Carousel
//
//##
@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
@carousel-control-color: #fff;
@carousel-control-width: 15%;
@carousel-control-opacity: .5;
@carousel-control-font-size: 20px;
@carousel-indicator-active-bg: #fff;
@carousel-indicator-border-color: #fff;
@carousel-caption-color: #fff;
//== Close
//
//##
@close-font-weight: bold;
@close-color: #000;
@close-text-shadow: 0 1px 0 #fff;
//== Code
//
//##
@code-color: #c7254e;
@code-bg: #f9f2f4;
@kbd-color: #fff;
@kbd-bg: #333;
@pre-bg: #f5f5f5;
@pre-color: @gray-dark;
@pre-border-color: #ccc;
@pre-scrollable-max-height: 340px;
//== Type
//
//##
//** Horizontal offset for forms and lists.
@component-offset-horizontal: 180px;
//** Text muted color
@text-muted: @gray-light;
//** Abbreviations and acronyms border color
@abbr-border-color: @gray-light;
//** Headings small color
@headings-small-color: @gray-light;
//** Blockquote small color
@blockquote-small-color: @gray-light;
//** Blockquote font size
@blockquote-font-size: (@font-size-base * 1.25);
//** Blockquote border color
@blockquote-border-color: @gray-lighter;
//** Page header border color
@page-header-border-color: @gray-lighter;
//** Width of horizontal description list titles
@dl-horizontal-offset: @component-offset-horizontal;
//** Point at which .dl-horizontal becomes horizontal
@dl-horizontal-breakpoint: @grid-float-breakpoint;
//** Horizontal line color.
@hr-border: @gray-lighter;
+58
View File
@@ -0,0 +1,58 @@
@import "node_modules/bootstrap/less/bootstrap.less";
// simplex theme
@import "src/less/bootstrap/theme.less";
@import "src/less/bootstrap/variables.less";
// app overrides here
// clean minimalist tables
.table.dataTable {
min-height: 150px;
}
.table {
// Cells
> thead,
> tbody,
> tfoot {
> tr {
> th,
> td {
border-top: 0px solid @table-border-color;
}
}
}
}
.table-responsive {
@media screen and (max-width: @screen-xs-max) {
border: 0px solid @table-border-color;
}
}
// brand colors: shit brown and red. Yay for adult humour.
@brand-danger: #D9230F;
@brand-primary: #D9831F;
@btn-primary-color: white;
.btn-primary {
font-weight: bold;
}
//** Background color for `<body>`.
@body-bg: white;
//** Global text color on `<body>`.
@text-color: @gray-base;
// change primary button color
@btn-default-color: black;
@btn-default-bg: #fff;
// override data tables
.pagination {
margin: 0px;
}