Upgrade to Bootstrap 3

This commit is contained in:
benweet 2013-08-19 22:44:13 +02:00
parent 2a738c0e54
commit ad584c1162
9 changed files with 8768 additions and 8466 deletions

View File

@ -1,5 +1,5 @@
CACHE MANIFEST
# Wed 7 Aug 2013 23:32:48 IST
# Mon 19 Aug 2013 00:01:51 IST
CACHE:
index.html

View File

@ -54,7 +54,7 @@ if(location.hostname.indexOf("benweet.github.io") === 0) {
}
var THEME_LIST = {
"": "Default",
"default": "Default",
"blue-gray": "Blue-Gray",
"night": "Night"
};

View File

@ -104,7 +104,7 @@ define([
// Layout orientation
utils.setInputRadio("radio-layout-orientation", settings.layoutOrientation);
// Theme
utils.setInputValue("#input-settings-theme", localStorage.theme);
utils.setInputValue("#input-settings-theme", localStorage.theme || 'default');
// Lazy rendering
utils.setInputChecked("#input-settings-lazy-rendering", settings.lazyRendering);
// Editor font family
@ -550,8 +550,8 @@ define([
// Load theme list
var themeOptions = _.reduce(THEME_LIST, function(themeOptions, name, value) {
return themeOptions + '<option value="' + value + '">' + name + '</option>';
}, "");
$("#input-settings-theme").html(themeOptions);
}, '');
document.getElementById('input-settings-theme').innerHTML = themeOptions;
var isModalShown = false;
$('.modal').on('show.bs.modal', function() {

14989
js/main-min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -84,6 +84,8 @@ if(location.search.match(/(\?|&)console/)) {
logger = console;
}
var theme = localStorage.theme || 'default';
// RequireJS entry point. By requiring synchronizer, publisher and
// media-importer, we are actually loading all the modules
require([
@ -93,7 +95,7 @@ require([
"publisher",
"mediaImporter",
"css",
"less!styles/main.less",
"less!styles/" + theme + ".less",
], function($, core) {
$(function() {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,55 +1,54 @@
body,
.btn,
#preview-contents,
.modal-footer,
input[disabled],
select[disabled],
textarea[disabled],
.input-prepend .add-on {
background-color: #222;
color: #fff;
}
@import "main.less"
input,
select,
textarea,
.input-prepend .btn,
.input-prepend
.add-on {
border-color: #444 !important;
}
@bg-light: #f2f2f2;
@preview-bg-light: #444;
@bg-navbar-hover: #333;
@navbar-text-color: #999;
@text-inv: #fff;
@text-light: #888;
@error-border: #ff8661;
@panel-button-color: #999;
@panel-bg: #222;
@folder-color: #aaa;
/* Bootstrap */
@body-bg: #222;
@text-color: #fff;
@link-color: #f73;
@input-color: #fff;
@input-border: #444;
@input-bg: #111;
@dropdown-border: #ddd;
@pre-border-color: #ddd;
@navbar-bg: #444;
@nav-link-hover-bg: #444;
@nav-disabled-link-color: #ccc;
@nav-disabled-link-hover-color: #bbb;
@dropdown-link-hover-bg: #888;
@dropdown-link-active-color: #fff;
@list-group-link-color: #fff;
@list-group-active-bg: @dropdown-link-hover-bg;
@list-group-hover-bg: #444;
@list-group-bg: #333;
@input-color-placeholder: #ccc;
@btn-default-color: #fff;
@btn-primary-color: #fff;
@btn-primary-bg: #555;
@btn-success-color: #bbb;
@btn-info-bg: @body-bg;
@gray-lighter: @body-bg;
@modal-content-bg: #333;
@modal-content-separator-color: #444;
@modal-backdrop-bg: #000;
@blockquote-border-color: fade(#fff, 8%);
@close-color: #fff;
/*
input[readonly], select[readonly], textarea[readonly] {
background-color: #fff;
}
#wmd-input, input, .dropdown-menu, .modal {
background: #111;
color: #fff;
}
.modal-header, .modal-footer {
border-color: #222;
}
a {
color: #f73;
}
a:hover,
a:focus {
color: #ffab81;
text-decoration: underline;
}
#file-title {
color: #bbb;
}
#file-title:hover {
color: #fff;
}
blockquote {
border-color: #333;
}
@ -70,10 +69,6 @@ blockquote {
background-image: url("../../img/glyphicons-halflings-white.png");
}
.navbar-inner {
background-color: #444 !important;
}
.navbar-inner .btn,
#extension-preview-buttons .btn {
background-color: #444;
@ -222,3 +217,4 @@ input[type="color"]:focus,
background-color:rgba(80,80,80,0.75) !important;
}
*/

View File

@ -11,5 +11,13 @@
indent_level: 1,
},
},
excludeShallow: ['css/css-builder', 'less/lessc-server', 'less/lessc'],
include: [
'less!styles/default.less',
'less!styles/night.less',
],
excludeShallow: [
'css/css-builder',
'less/lessc-server',
'less/lessc'
],
})