diff --git a/CHANGELOG b/CHANGELOG index 748b7a1a84..85c0cd3fb2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,23 @@ v2.3.0 (XXXX-XX-XX) ------------------- +* command-line options that require a boolean value now validate the + value given on the command-line + + This prevents issues if no value is specified for an option that + requires a boolean value. For example, the following command-line would + have caused trouble in 2.2, because `--server.endpoint` would have been + used as the value for the `--server.disable-authentication` options + (which requires a boolean value): + + arangod --server.disable-authentication --server.endpoint tcp://127.0.0.1:8529 data + + In 2.3, running this command will fail with an error and requires to + be modified to: + + arangod --server.disable-authentication true --server.endpoint tcp://127.0.0.1:8529 data + + * improved performance of CSV import in arangoimp * fixed issue #1027: Stack traces are off-by-one diff --git a/arangod/Aql/ExecutionBlock.cpp b/arangod/Aql/ExecutionBlock.cpp index 800672c8cb..a456139329 100644 --- a/arangod/Aql/ExecutionBlock.cpp +++ b/arangod/Aql/ExecutionBlock.cpp @@ -3625,6 +3625,18 @@ BlockWithClients::BlockWithClients (ExecutionEngine* engine, } } +//////////////////////////////////////////////////////////////////////////////// +/// @brief shutdown +//////////////////////////////////////////////////////////////////////////////// + +int BlockWithClients::shutdown () { + if (!_initOrShutdown) { + return TRI_ERROR_NO_ERROR; + } + _initOrShutdown = false; + return ExecutionBlock::shutdown(); +} + //////////////////////////////////////////////////////////////////////////////// /// @brief getSomeForShard //////////////////////////////////////////////////////////////////////////////// @@ -3722,18 +3734,6 @@ int ScatterBlock::initializeCursor (AqlItemBlock* items, size_t pos) { return TRI_ERROR_NO_ERROR; } -//////////////////////////////////////////////////////////////////////////////// -/// @brief shutdown -//////////////////////////////////////////////////////////////////////////////// - -int ScatterBlock::shutdown () { - if (!_initOrShutdown) { - return TRI_ERROR_NO_ERROR; - } - _initOrShutdown = false; - return ExecutionBlock::shutdown(); -} - //////////////////////////////////////////////////////////////////////////////// /// @brief hasMoreForShard: any more for shard ? //////////////////////////////////////////////////////////////////////////////// @@ -3859,6 +3859,36 @@ int ScatterBlock::getOrSkipSomeForShard (size_t atLeast, // --SECTION-- class DistributeBlock // ----------------------------------------------------------------------------- +//////////////////////////////////////////////////////////////////////////////// +/// @brief initializeCursor +//////////////////////////////////////////////////////////////////////////////// + +int DistributeBlock::initializeCursor (AqlItemBlock* items, size_t pos) { + + if (!_initOrShutdown) { + return TRI_ERROR_NO_ERROR; + } + + int res = ExecutionBlock::initializeCursor(items, pos); + + if (res != TRI_ERROR_NO_ERROR) { + return res; + } + + for (auto x: _distBuffer) { + x.clear(); + } + _distBuffer.clear(); + _distBuffer.reserve(_nrClients); + + for (auto x: _doneForClient) { + x = false; + } + + _initOrShutdown = false; + return TRI_ERROR_NO_ERROR; +} + //////////////////////////////////////////////////////////////////////////////// /// @brief hasMore: any more for any shard? //////////////////////////////////////////////////////////////////////////////// @@ -3920,7 +3950,7 @@ int DistributeBlock::getOrSkipSomeForShard (size_t atLeast, } } - skipped = std::min(buf.size(), atMost); + skipped = (std::min)(buf.size(), atMost); if (skipping) { for (size_t i = 0; i < skipped; i++){ @@ -3975,7 +4005,7 @@ int DistributeBlock::getOrSkipSomeForShard (size_t atLeast, return TRI_ERROR_NO_ERROR; // don't have to do any clean-up } else { - smallestIndex = std::min(index, smallestIndex); + smallestIndex = (std::min)(index, smallestIndex); } } @@ -4030,7 +4060,8 @@ bool DistributeBlock::getBlockForClient (size_t atLeast, size_t reg = cur->getNrRegs() - 1; // FIXME this is a totally arbitrary choice while (_pos < cur->size() && buf.at(clientId).size() < atLeast) { // inspect cur in row _pos and check to which shard it should be sent . . - size_t id = sendToClient(cur->getValue(_pos, reg)); + size_t id = sendToClient(cur->getValue(_pos, + static_cast(reg))); buf.at(id).push_back(make_pair(_index, _pos++)); } if (_pos == cur->size()) { diff --git a/arangod/Aql/ExecutionBlock.h b/arangod/Aql/ExecutionBlock.h index cf225c2090..d1eda7c810 100644 --- a/arangod/Aql/ExecutionBlock.h +++ b/arangod/Aql/ExecutionBlock.h @@ -1524,6 +1524,12 @@ namespace triagens { public: +//////////////////////////////////////////////////////////////////////////////// +/// @brief shutdown +//////////////////////////////////////////////////////////////////////////////// + + int shutdown (); + //////////////////////////////////////////////////////////////////////////////// /// @brief getSome: shouldn't be used, use skipSomeForShard //////////////////////////////////////////////////////////////////////////////// @@ -1685,12 +1691,6 @@ namespace triagens { int initializeCursor (AqlItemBlock* items, size_t pos); -//////////////////////////////////////////////////////////////////////////////// -/// @brief initializeCursor -//////////////////////////////////////////////////////////////////////////////// - - int shutdown (); - //////////////////////////////////////////////////////////////////////////////// /// @brief hasMoreForShard: any more for shard ? //////////////////////////////////////////////////////////////////////////////// @@ -1752,6 +1752,12 @@ namespace triagens { ~DistributeBlock () {} +//////////////////////////////////////////////////////////////////////////////// +/// @brief initializeCursor +//////////////////////////////////////////////////////////////////////////////// + + int initializeCursor (AqlItemBlock* items, size_t pos); + //////////////////////////////////////////////////////////////////////////////// /// @brief remainingForShard: remaining for shard ? //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/V8Server/v8-user-structures.cpp b/arangod/V8Server/v8-user-structures.cpp index 2a15535c98..ea4b6dcd90 100644 --- a/arangod/V8Server/v8-user-structures.cpp +++ b/arangod/V8Server/v8-user-structures.cpp @@ -637,8 +637,8 @@ class KeySpace { return scope.Close(result); } - v8::Handle keyAt (std::string const& key, - int64_t index) { + v8::Handle keyGetAt (std::string const& key, + int64_t index) { v8::HandleScope scope; v8::Handle result; @@ -673,6 +673,55 @@ class KeySpace { return scope.Close(result); } + + bool keySetAt (std::string const& key, + int64_t index, + v8::Handle const& value) { + WRITE_LOCKER(_lock); + + auto found = static_cast(TRI_LookupByKeyAssociativePointer(&_hash, key.c_str())); + + if (found == nullptr) { + // TODO: change error code + return TRI_ERROR_INTERNAL; + } + else { + if (! TRI_IsListJson(found->json)) { + // TODO: change error code + return TRI_ERROR_INTERNAL; + } + + size_t const n = found->json->_value._objects._length; + if (index < 0) { + // TODO: change error code + return TRI_ERROR_INTERNAL; + } + + auto json = TRI_ObjectToJson(value); + if (json == nullptr) { + return TRI_ERROR_OUT_OF_MEMORY; + } + + if (index >= static_cast(n)) { + // insert new element + TRI_InsertVector(&found->json->_value._objects, json, static_cast(index)); + } + else { + // overwrite existing element + auto item = static_cast(TRI_AtVector(&found->json->_value._objects, static_cast(index))); + if (item != nullptr) { + TRI_DestroyJson(TRI_UNKNOWN_MEM_ZONE, item); + } + + TRI_SetVector(&found->json->_value._objects, static_cast(index), json); + } + + // only free pointer to json, but not its internal structures + TRI_Free(TRI_UNKNOWN_MEM_ZONE, json); + } + + return TRI_ERROR_NO_ERROR; + } char const* keyType (std::string const& key) { READ_LOCKER(_lock); @@ -886,8 +935,8 @@ static v8::Handle JS_KeyspaceDrop (v8::Arguments const& argv) { TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL); } - h->data.erase(it); delete (*it).second; + h->data.erase(it); } return scope.Close(v8::True()); @@ -1547,11 +1596,11 @@ static v8::Handle JS_KeyTransfer (v8::Arguments const& argv) { /// @brief get an element at a specific list position //////////////////////////////////////////////////////////////////////////////// -static v8::Handle JS_KeyAt (v8::Arguments const& argv) { +static v8::Handle JS_KeyGetAt (v8::Arguments const& argv) { v8::HandleScope scope; if (argv.Length() < 3 || ! argv[0]->IsString() || ! argv[1]->IsString()) { - TRI_V8_EXCEPTION_USAGE(scope, "KEY_AT(, , )"); + TRI_V8_EXCEPTION_USAGE(scope, "KEY_GET_AT(, , )"); } TRI_vocbase_t* vocbase = GetContextVocBase(); @@ -1574,7 +1623,46 @@ static v8::Handle JS_KeyAt (v8::Arguments const& argv) { TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL); } - return scope.Close(hash->keyAt(key, offset)); + return scope.Close(hash->keyGetAt(key, offset)); +} + +//////////////////////////////////////////////////////////////////////////////// +/// @brief set an element at a specific list position +//////////////////////////////////////////////////////////////////////////////// + +static v8::Handle JS_KeySetAt (v8::Arguments const& argv) { + v8::HandleScope scope; + + if (argv.Length() < 4 || ! argv[0]->IsString() || ! argv[1]->IsString()) { + TRI_V8_EXCEPTION_USAGE(scope, "KEY_SET_AT(, , , )"); + } + + TRI_vocbase_t* vocbase = GetContextVocBase(); + + if (vocbase == nullptr) { + TRI_V8_EXCEPTION_INTERNAL(scope, "cannot extract vocbase"); + } + + std::string const&& name = TRI_ObjectToString(argv[0]); + std::string const&& key = TRI_ObjectToString(argv[1]); + int64_t offset = TRI_ObjectToInt64(argv[2]); + + auto h = &(static_cast(vocbase->_userStructures)->hashes); + READ_LOCKER(h->lock); + + auto hash = GetKeySpace(vocbase, name); + + if (hash == nullptr) { + // TODO: change error code + TRI_V8_EXCEPTION(scope, TRI_ERROR_INTERNAL); + } + + int res = hash->keySetAt(key, offset, argv[3]); + if (res != TRI_ERROR_NO_ERROR) { + TRI_V8_EXCEPTION(scope, res); + } + + return scope.Close(v8::True()); } //////////////////////////////////////////////////////////////////////////////// @@ -1679,7 +1767,13 @@ void TRI_CreateUserStructuresVocBase (TRI_vocbase_t* vocbase) { void TRI_FreeUserStructuresVocBase (TRI_vocbase_t* vocbase) { if (vocbase->_userStructures != nullptr) { - delete static_cast(vocbase->_userStructures); + auto us = static_cast(vocbase->_userStructures); + for (auto& hash : us->hashes.data) { + if (hash.second != nullptr) { + delete hash.second; + } + } + delete us; } } @@ -1716,7 +1810,8 @@ void TRI_InitV8UserStructures (v8::Handle context) { TRI_AddGlobalFunctionVocbase(context, "KEY_PUSH", JS_KeyPush); TRI_AddGlobalFunctionVocbase(context, "KEY_POP", JS_KeyPop); TRI_AddGlobalFunctionVocbase(context, "KEY_TRANSFER", JS_KeyTransfer); - TRI_AddGlobalFunctionVocbase(context, "KEY_AT", JS_KeyAt); + TRI_AddGlobalFunctionVocbase(context, "KEY_GET_AT", JS_KeyGetAt); + TRI_AddGlobalFunctionVocbase(context, "KEY_SET_AT", JS_KeySetAt); } // ----------------------------------------------------------------------------- diff --git a/arangosh/V8Client/ImportHelper.cpp b/arangosh/V8Client/ImportHelper.cpp index d2454c8583..5d2bb56609 100644 --- a/arangosh/V8Client/ImportHelper.cpp +++ b/arangosh/V8Client/ImportHelper.cpp @@ -415,8 +415,8 @@ namespace triagens { double pct = 100.0 * ((double) totalRead / (double) totalLength); if (pct >= nextProgress && totalLength >= 1024) { - LOG_INFO("processed %lld bytes (%0.2f%%) of input file", (long long) totalRead, pct); - nextProgress = pct + ProgressStep; + LOG_INFO("processed %lld bytes (%0.1f%%) of input file", (long long) totalRead, nextProgress); + nextProgress = (double) ((int) (pct + ProgressStep)); } } diff --git a/js/Makefile.files b/js/Makefile.files index f9535ad628..c890f4fbb6 100644 --- a/js/Makefile.files +++ b/js/Makefile.files @@ -87,15 +87,15 @@ JAVASCRIPT_JSLINT = \ jslint: @RESULT=0; \ - for file in $(JAVASCRIPT_JSLINT); do \ - @builddir@/bin/arangosh \ - -c none \ - --log.level error \ - --server.password "" \ - --javascript.startup-directory @srcdir@/js \ - --jslint $$file; \ - if [ "$$?x" != "0x" ]; then RESULT=1; fi; \ - done; \ + FILELIST=""; \ + for file in $(JAVASCRIPT_JSLINT); do FILELIST="$$FILELIST --jslint $$file"; done; \ + @builddir@/bin/arangosh \ + -c none \ + --log.level error \ + --server.password "" \ + --javascript.startup-directory @srcdir@/js \ + $$FILELIST; \ + if [ "$$?x" != "0x" ]; then RESULT=1; fi; \ exit $$RESULT jshint: jslint diff --git a/js/apps/system/aardvark/aardvark.js b/js/apps/system/aardvark/aardvark.js index eef46205a4..8dc3248e46 100644 --- a/js/apps/system/aardvark/aardvark.js +++ b/js/apps/system/aardvark/aardvark.js @@ -400,71 +400,9 @@ controller.get("/query/result/download/:query", function(req, res) { var query = req.params("query"), parsedQuery; - var _utf8_decode = function (utftext) { - var string = ""; - var i = 0; - var c = c1 = c2 = 0; - - while ( i < utftext.length ) { - c = utftext.charCodeAt(i); - - if (c < 128) { - string += String.fromCharCode(c); - i++; - } - else if((c > 191) && (c < 224)) { - c2 = utftext.charCodeAt(i+1); - string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); - i += 2; - } - else { - c2 = utftext.charCodeAt(i+1); - c3 = utftext.charCodeAt(i+2); - string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); - i += 3; - } - } - - return string; - } - - var decodeFunction = function (input) { - var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - var output = ""; - var chr1, chr2, chr3; - var enc1, enc2, enc3, enc4; - var i = 0; - - input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); - - while (i < input.length) { - enc1 = keyStr.indexOf(input.charAt(i++)); - enc2 = keyStr.indexOf(input.charAt(i++)); - enc3 = keyStr.indexOf(input.charAt(i++)); - enc4 = keyStr.indexOf(input.charAt(i++)); - - chr1 = (enc1 << 2) | (enc2 >> 4); - chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); - chr3 = ((enc3 & 3) << 6) | enc4; - - output = output + String.fromCharCode(chr1); - - if (enc3 != 64) { - output = output + String.fromCharCode(chr2); - } - if (enc4 != 64) { - output = output + String.fromCharCode(chr3); - } - } - - output = _utf8_decode(output); - - return output; - - }; - - query = decodeFunction(query); - + var internal = require("internal"); + query = internal.base64Decode(query); +internal.print(query); try { parsedQuery = JSON.parse(query); } diff --git a/js/apps/system/aardvark/frontend/scss/_tiles.scss b/js/apps/system/aardvark/frontend/scss/_tiles.scss index 9168e2847a..0259840a61 100644 --- a/js/apps/system/aardvark/frontend/scss/_tiles.scss +++ b/js/apps/system/aardvark/frontend/scss/_tiles.scss @@ -167,6 +167,10 @@ $iconsize: 50px; height: 0; padding-left: 4px; padding-right: 9px; + + &.loading { + border-bottom-color: $c-unloaded; + } &.loaded { border-bottom-color: $c-positive; diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css index e22904731a..68e348d5d1 100644 --- a/js/apps/system/aardvark/frontend/scss/generated.css +++ b/js/apps/system/aardvark/frontend/scss/generated.css @@ -1,6 +1,7 @@ +@charset "UTF-8"; body { - background-color: white !important; - color: #333333; + background-color: #fff !important; + color: #333; display: block; font-family: 'Open Sans', sans-serif !important; font-size: 14px; @@ -107,7 +108,7 @@ textarea, .fa-border { padding: .2em .25em .15em; - border: solid 0.08em #eeeeee; + border: solid 0.08em #eee; border-radius: .1em; } .pull-right { @@ -130,31 +131,26 @@ textarea, @-moz-keyframes spin { 0% { -moz-transform: rotate(0deg); } - 100% { -moz-transform: rotate(359deg); } } @-webkit-keyframes spin { 0% { -webkit-transform: rotate(0deg); } - 100% { -webkit-transform: rotate(359deg); } } @-o-keyframes spin { 0% { -o-transform: rotate(0deg); } - 100% { -o-transform: rotate(359deg); } } @-ms-keyframes spin { 0% { -ms-transform: rotate(0deg); } - 100% { -ms-transform: rotate(359deg); } } @keyframes spin { 0% { transform: rotate(0deg); } - 100% { transform: rotate(359deg); } } .fa-rotate-90 { @@ -218,1156 +214,1156 @@ textarea, font-size: 2em; } .fa-inverse { - color: white; } + color: #fff; } /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen readers do not read off random characters that represent icons */ .fa-glass:before { - content: "\f000"; } + content: ""; } .fa-music:before { - content: "\f001"; } + content: ""; } .fa-search:before { - content: "\f002"; } + content: ""; } .fa-envelope-o:before { - content: "\f003"; } + content: ""; } .fa-heart:before { - content: "\f004"; } + content: ""; } .fa-star:before { - content: "\f005"; } + content: ""; } .fa-star-o:before { - content: "\f006"; } + content: ""; } .fa-user:before { - content: "\f007"; } + content: ""; } .fa-film:before { - content: "\f008"; } + content: ""; } .fa-th-large:before { - content: "\f009"; } + content: ""; } .fa-th:before { - content: "\f00a"; } + content: ""; } .fa-th-list:before { - content: "\f00b"; } + content: ""; } .fa-check:before { - content: "\f00c"; } + content: ""; } .fa-times:before { - content: "\f00d"; } + content: ""; } .fa-search-plus:before { - content: "\f00e"; } + content: ""; } .fa-search-minus:before { - content: "\f010"; } + content: ""; } .fa-power-off:before { - content: "\f011"; } + content: ""; } .fa-signal:before { - content: "\f012"; } + content: ""; } .fa-gear:before, .fa-cog:before { - content: "\f013"; } + content: ""; } .fa-trash-o:before { - content: "\f014"; } + content: ""; } .fa-home:before { - content: "\f015"; } + content: ""; } .fa-file-o:before { - content: "\f016"; } + content: ""; } .fa-clock-o:before { - content: "\f017"; } + content: ""; } .fa-road:before { - content: "\f018"; } + content: ""; } .fa-download:before { - content: "\f019"; } + content: ""; } .fa-arrow-circle-o-down:before { - content: "\f01a"; } + content: ""; } .fa-arrow-circle-o-up:before { - content: "\f01b"; } + content: ""; } .fa-inbox:before { - content: "\f01c"; } + content: ""; } .fa-play-circle-o:before { - content: "\f01d"; } + content: ""; } .fa-rotate-right:before, .fa-repeat:before { - content: "\f01e"; } + content: ""; } .fa-refresh:before { - content: "\f021"; } + content: ""; } .fa-list-alt:before { - content: "\f022"; } + content: ""; } .fa-lock:before { - content: "\f023"; } + content: ""; } .fa-flag:before { - content: "\f024"; } + content: ""; } .fa-headphones:before { - content: "\f025"; } + content: ""; } .fa-volume-off:before { - content: "\f026"; } + content: ""; } .fa-volume-down:before { - content: "\f027"; } + content: ""; } .fa-volume-up:before { - content: "\f028"; } + content: ""; } .fa-qrcode:before { - content: "\f029"; } + content: ""; } .fa-barcode:before { - content: "\f02a"; } + content: ""; } .fa-tag:before { - content: "\f02b"; } + content: ""; } .fa-tags:before { - content: "\f02c"; } + content: ""; } .fa-book:before { - content: "\f02d"; } + content: ""; } .fa-bookmark:before { - content: "\f02e"; } + content: ""; } .fa-print:before { - content: "\f02f"; } + content: ""; } .fa-camera:before { - content: "\f030"; } + content: ""; } .fa-font:before { - content: "\f031"; } + content: ""; } .fa-bold:before { - content: "\f032"; } + content: ""; } .fa-italic:before { - content: "\f033"; } + content: ""; } .fa-text-height:before { - content: "\f034"; } + content: ""; } .fa-text-width:before { - content: "\f035"; } + content: ""; } .fa-align-left:before { - content: "\f036"; } + content: ""; } .fa-align-center:before { - content: "\f037"; } + content: ""; } .fa-align-right:before { - content: "\f038"; } + content: ""; } .fa-align-justify:before { - content: "\f039"; } + content: ""; } .fa-list:before { - content: "\f03a"; } + content: ""; } .fa-dedent:before, .fa-outdent:before { - content: "\f03b"; } + content: ""; } .fa-indent:before { - content: "\f03c"; } + content: ""; } .fa-video-camera:before { - content: "\f03d"; } + content: ""; } .fa-picture-o:before { - content: "\f03e"; } + content: ""; } .fa-pencil:before { - content: "\f040"; } + content: ""; } .fa-map-marker:before { - content: "\f041"; } + content: ""; } .fa-adjust:before { - content: "\f042"; } + content: ""; } .fa-tint:before { - content: "\f043"; } + content: ""; } .fa-edit:before, .fa-pencil-square-o:before { - content: "\f044"; } + content: ""; } .fa-share-square-o:before { - content: "\f045"; } + content: ""; } .fa-check-square-o:before { - content: "\f046"; } + content: ""; } .fa-arrows:before { - content: "\f047"; } + content: ""; } .fa-step-backward:before { - content: "\f048"; } + content: ""; } .fa-fast-backward:before { - content: "\f049"; } + content: ""; } .fa-backward:before { - content: "\f04a"; } + content: ""; } .fa-play:before { - content: "\f04b"; } + content: ""; } .fa-pause:before { - content: "\f04c"; } + content: ""; } .fa-stop:before { - content: "\f04d"; } + content: ""; } .fa-forward:before { - content: "\f04e"; } + content: ""; } .fa-fast-forward:before { - content: "\f050"; } + content: ""; } .fa-step-forward:before { - content: "\f051"; } + content: ""; } .fa-eject:before { - content: "\f052"; } + content: ""; } .fa-chevron-left:before { - content: "\f053"; } + content: ""; } .fa-chevron-right:before { - content: "\f054"; } + content: ""; } .fa-plus-circle:before { - content: "\f055"; } + content: ""; } .fa-minus-circle:before { - content: "\f056"; } + content: ""; } .fa-times-circle:before { - content: "\f057"; } + content: ""; } .fa-check-circle:before { - content: "\f058"; } + content: ""; } .fa-question-circle:before { - content: "\f059"; } + content: ""; } .fa-info-circle:before { - content: "\f05a"; } + content: ""; } .fa-crosshairs:before { - content: "\f05b"; } + content: ""; } .fa-times-circle-o:before { - content: "\f05c"; } + content: ""; } .fa-check-circle-o:before { - content: "\f05d"; } + content: ""; } .fa-ban:before { - content: "\f05e"; } + content: ""; } .fa-arrow-left:before { - content: "\f060"; } + content: ""; } .fa-arrow-right:before { - content: "\f061"; } + content: ""; } .fa-arrow-up:before { - content: "\f062"; } + content: ""; } .fa-arrow-down:before { - content: "\f063"; } + content: ""; } .fa-mail-forward:before, .fa-share:before { - content: "\f064"; } + content: ""; } .fa-expand:before { - content: "\f065"; } + content: ""; } .fa-compress:before { - content: "\f066"; } + content: ""; } .fa-plus:before { - content: "\f067"; } + content: ""; } .fa-minus:before { - content: "\f068"; } + content: ""; } .fa-asterisk:before { - content: "\f069"; } + content: ""; } .fa-exclamation-circle:before { - content: "\f06a"; } + content: ""; } .fa-gift:before { - content: "\f06b"; } + content: ""; } .fa-leaf:before { - content: "\f06c"; } + content: ""; } .fa-fire:before { - content: "\f06d"; } + content: ""; } .fa-eye:before { - content: "\f06e"; } + content: ""; } .fa-eye-slash:before { - content: "\f070"; } + content: ""; } .fa-warning:before, .fa-exclamation-triangle:before { - content: "\f071"; } + content: ""; } .fa-plane:before { - content: "\f072"; } + content: ""; } .fa-calendar:before { - content: "\f073"; } + content: ""; } .fa-random:before { - content: "\f074"; } + content: ""; } .fa-comment:before { - content: "\f075"; } + content: ""; } .fa-magnet:before { - content: "\f076"; } + content: ""; } .fa-chevron-up:before { - content: "\f077"; } + content: ""; } .fa-chevron-down:before { - content: "\f078"; } + content: ""; } .fa-retweet:before { - content: "\f079"; } + content: ""; } .fa-shopping-cart:before { - content: "\f07a"; } + content: ""; } .fa-folder:before { - content: "\f07b"; } + content: ""; } .fa-folder-open:before { - content: "\f07c"; } + content: ""; } .fa-arrows-v:before { - content: "\f07d"; } + content: ""; } .fa-arrows-h:before { - content: "\f07e"; } + content: ""; } .fa-bar-chart-o:before { - content: "\f080"; } + content: ""; } .fa-twitter-square:before { - content: "\f081"; } + content: ""; } .fa-facebook-square:before { - content: "\f082"; } + content: ""; } .fa-camera-retro:before { - content: "\f083"; } + content: ""; } .fa-key:before { - content: "\f084"; } + content: ""; } .fa-gears:before, .fa-cogs:before { - content: "\f085"; } + content: ""; } .fa-comments:before { - content: "\f086"; } + content: ""; } .fa-thumbs-o-up:before { - content: "\f087"; } + content: ""; } .fa-thumbs-o-down:before { - content: "\f088"; } + content: ""; } .fa-star-half:before { - content: "\f089"; } + content: ""; } .fa-heart-o:before { - content: "\f08a"; } + content: ""; } .fa-sign-out:before { - content: "\f08b"; } + content: ""; } .fa-linkedin-square:before { - content: "\f08c"; } + content: ""; } .fa-thumb-tack:before { - content: "\f08d"; } + content: ""; } .fa-external-link:before { - content: "\f08e"; } + content: ""; } .fa-sign-in:before { - content: "\f090"; } + content: ""; } .fa-trophy:before { - content: "\f091"; } + content: ""; } .fa-github-square:before { - content: "\f092"; } + content: ""; } .fa-upload:before { - content: "\f093"; } + content: ""; } .fa-lemon-o:before { - content: "\f094"; } + content: ""; } .fa-phone:before { - content: "\f095"; } + content: ""; } .fa-square-o:before { - content: "\f096"; } + content: ""; } .fa-bookmark-o:before { - content: "\f097"; } + content: ""; } .fa-phone-square:before { - content: "\f098"; } + content: ""; } .fa-twitter:before { - content: "\f099"; } + content: ""; } .fa-facebook:before { - content: "\f09a"; } + content: ""; } .fa-github:before { - content: "\f09b"; } + content: ""; } .fa-unlock:before { - content: "\f09c"; } + content: ""; } .fa-credit-card:before { - content: "\f09d"; } + content: ""; } .fa-rss:before { - content: "\f09e"; } + content: ""; } .fa-hdd-o:before { - content: "\f0a0"; } + content: ""; } .fa-bullhorn:before { - content: "\f0a1"; } + content: ""; } .fa-bell:before { - content: "\f0f3"; } + content: ""; } .fa-certificate:before { - content: "\f0a3"; } + content: ""; } .fa-hand-o-right:before { - content: "\f0a4"; } + content: ""; } .fa-hand-o-left:before { - content: "\f0a5"; } + content: ""; } .fa-hand-o-up:before { - content: "\f0a6"; } + content: ""; } .fa-hand-o-down:before { - content: "\f0a7"; } + content: ""; } .fa-arrow-circle-left:before { - content: "\f0a8"; } + content: ""; } .fa-arrow-circle-right:before { - content: "\f0a9"; } + content: ""; } .fa-arrow-circle-up:before { - content: "\f0aa"; } + content: ""; } .fa-arrow-circle-down:before { - content: "\f0ab"; } + content: ""; } .fa-globe:before { - content: "\f0ac"; } + content: ""; } .fa-wrench:before { - content: "\f0ad"; } + content: ""; } .fa-tasks:before { - content: "\f0ae"; } + content: ""; } .fa-filter:before { - content: "\f0b0"; } + content: ""; } .fa-briefcase:before { - content: "\f0b1"; } + content: ""; } .fa-arrows-alt:before { - content: "\f0b2"; } + content: ""; } .fa-group:before, .fa-users:before { - content: "\f0c0"; } + content: ""; } .fa-chain:before, .fa-link:before { - content: "\f0c1"; } + content: ""; } .fa-cloud:before { - content: "\f0c2"; } + content: ""; } .fa-flask:before { - content: "\f0c3"; } + content: ""; } .fa-cut:before, .fa-scissors:before { - content: "\f0c4"; } + content: ""; } .fa-copy:before, .fa-files-o:before { - content: "\f0c5"; } + content: ""; } .fa-paperclip:before { - content: "\f0c6"; } + content: ""; } .fa-save:before, .fa-floppy-o:before { - content: "\f0c7"; } + content: ""; } .fa-square:before { - content: "\f0c8"; } + content: ""; } .fa-bars:before { - content: "\f0c9"; } + content: ""; } .fa-list-ul:before { - content: "\f0ca"; } + content: ""; } .fa-list-ol:before { - content: "\f0cb"; } + content: ""; } .fa-strikethrough:before { - content: "\f0cc"; } + content: ""; } .fa-underline:before { - content: "\f0cd"; } + content: ""; } .fa-table:before { - content: "\f0ce"; } + content: ""; } .fa-magic:before { - content: "\f0d0"; } + content: ""; } .fa-truck:before { - content: "\f0d1"; } + content: ""; } .fa-pinterest:before { - content: "\f0d2"; } + content: ""; } .fa-pinterest-square:before { - content: "\f0d3"; } + content: ""; } .fa-google-plus-square:before { - content: "\f0d4"; } + content: ""; } .fa-google-plus:before { - content: "\f0d5"; } + content: ""; } .fa-money:before { - content: "\f0d6"; } + content: ""; } .fa-caret-down:before { - content: "\f0d7"; } + content: ""; } .fa-caret-up:before { - content: "\f0d8"; } + content: ""; } .fa-caret-left:before { - content: "\f0d9"; } + content: ""; } .fa-caret-right:before { - content: "\f0da"; } + content: ""; } .fa-columns:before { - content: "\f0db"; } + content: ""; } .fa-unsorted:before, .fa-sort:before { - content: "\f0dc"; } + content: ""; } .fa-sort-down:before, .fa-sort-asc:before { - content: "\f0dd"; } + content: ""; } .fa-sort-up:before, .fa-sort-desc:before { - content: "\f0de"; } + content: ""; } .fa-envelope:before { - content: "\f0e0"; } + content: ""; } .fa-linkedin:before { - content: "\f0e1"; } + content: ""; } .fa-rotate-left:before, .fa-undo:before { - content: "\f0e2"; } + content: ""; } .fa-legal:before, .fa-gavel:before { - content: "\f0e3"; } + content: ""; } .fa-dashboard:before, .fa-tachometer:before { - content: "\f0e4"; } + content: ""; } .fa-comment-o:before { - content: "\f0e5"; } + content: ""; } .fa-comments-o:before { - content: "\f0e6"; } + content: ""; } .fa-flash:before, .fa-bolt:before { - content: "\f0e7"; } + content: ""; } .fa-sitemap:before { - content: "\f0e8"; } + content: ""; } .fa-umbrella:before { - content: "\f0e9"; } + content: ""; } .fa-paste:before, .fa-clipboard:before { - content: "\f0ea"; } + content: ""; } .fa-lightbulb-o:before { - content: "\f0eb"; } + content: ""; } .fa-exchange:before { - content: "\f0ec"; } + content: ""; } .fa-cloud-download:before { - content: "\f0ed"; } + content: ""; } .fa-cloud-upload:before { - content: "\f0ee"; } + content: ""; } .fa-user-md:before { - content: "\f0f0"; } + content: ""; } .fa-stethoscope:before { - content: "\f0f1"; } + content: ""; } .fa-suitcase:before { - content: "\f0f2"; } + content: ""; } .fa-bell-o:before { - content: "\f0a2"; } + content: ""; } .fa-coffee:before { - content: "\f0f4"; } + content: ""; } .fa-cutlery:before { - content: "\f0f5"; } + content: ""; } .fa-file-text-o:before { - content: "\f0f6"; } + content: ""; } .fa-building-o:before { - content: "\f0f7"; } + content: ""; } .fa-hospital-o:before { - content: "\f0f8"; } + content: ""; } .fa-ambulance:before { - content: "\f0f9"; } + content: ""; } .fa-medkit:before { - content: "\f0fa"; } + content: ""; } .fa-fighter-jet:before { - content: "\f0fb"; } + content: ""; } .fa-beer:before { - content: "\f0fc"; } + content: ""; } .fa-h-square:before { - content: "\f0fd"; } + content: ""; } .fa-plus-square:before { - content: "\f0fe"; } + content: ""; } .fa-angle-double-left:before { - content: "\f100"; } + content: ""; } .fa-angle-double-right:before { - content: "\f101"; } + content: ""; } .fa-angle-double-up:before { - content: "\f102"; } + content: ""; } .fa-angle-double-down:before { - content: "\f103"; } + content: ""; } .fa-angle-left:before { - content: "\f104"; } + content: ""; } .fa-angle-right:before { - content: "\f105"; } + content: ""; } .fa-angle-up:before { - content: "\f106"; } + content: ""; } .fa-angle-down:before { - content: "\f107"; } + content: ""; } .fa-desktop:before { - content: "\f108"; } + content: ""; } .fa-laptop:before { - content: "\f109"; } + content: ""; } .fa-tablet:before { - content: "\f10a"; } + content: ""; } .fa-mobile-phone:before, .fa-mobile:before { - content: "\f10b"; } + content: ""; } .fa-circle-o:before { - content: "\f10c"; } + content: ""; } .fa-quote-left:before { - content: "\f10d"; } + content: ""; } .fa-quote-right:before { - content: "\f10e"; } + content: ""; } .fa-spinner:before { - content: "\f110"; } + content: ""; } .fa-circle:before { - content: "\f111"; } + content: ""; } .fa-mail-reply:before, .fa-reply:before { - content: "\f112"; } + content: ""; } .fa-github-alt:before { - content: "\f113"; } + content: ""; } .fa-folder-o:before { - content: "\f114"; } + content: ""; } .fa-folder-open-o:before { - content: "\f115"; } + content: ""; } .fa-smile-o:before { - content: "\f118"; } + content: ""; } .fa-frown-o:before { - content: "\f119"; } + content: ""; } .fa-meh-o:before { - content: "\f11a"; } + content: ""; } .fa-gamepad:before { - content: "\f11b"; } + content: ""; } .fa-keyboard-o:before { - content: "\f11c"; } + content: ""; } .fa-flag-o:before { - content: "\f11d"; } + content: ""; } .fa-flag-checkered:before { - content: "\f11e"; } + content: ""; } .fa-terminal:before { - content: "\f120"; } + content: ""; } .fa-code:before { - content: "\f121"; } + content: ""; } .fa-reply-all:before { - content: "\f122"; } + content: ""; } .fa-mail-reply-all:before { - content: "\f122"; } + content: ""; } .fa-star-half-empty:before, .fa-star-half-full:before, .fa-star-half-o:before { - content: "\f123"; } + content: ""; } .fa-location-arrow:before { - content: "\f124"; } + content: ""; } .fa-crop:before { - content: "\f125"; } + content: ""; } .fa-code-fork:before { - content: "\f126"; } + content: ""; } .fa-unlink:before, .fa-chain-broken:before { - content: "\f127"; } + content: ""; } .fa-question:before { - content: "\f128"; } + content: ""; } .fa-info:before { - content: "\f129"; } + content: ""; } .fa-exclamation:before { - content: "\f12a"; } + content: ""; } .fa-superscript:before { - content: "\f12b"; } + content: ""; } .fa-subscript:before { - content: "\f12c"; } + content: ""; } .fa-eraser:before { - content: "\f12d"; } + content: ""; } .fa-puzzle-piece:before { - content: "\f12e"; } + content: ""; } .fa-microphone:before { - content: "\f130"; } + content: ""; } .fa-microphone-slash:before { - content: "\f131"; } + content: ""; } .fa-shield:before { - content: "\f132"; } + content: ""; } .fa-calendar-o:before { - content: "\f133"; } + content: ""; } .fa-fire-extinguisher:before { - content: "\f134"; } + content: ""; } .fa-rocket:before { - content: "\f135"; } + content: ""; } .fa-maxcdn:before { - content: "\f136"; } + content: ""; } .fa-chevron-circle-left:before { - content: "\f137"; } + content: ""; } .fa-chevron-circle-right:before { - content: "\f138"; } + content: ""; } .fa-chevron-circle-up:before { - content: "\f139"; } + content: ""; } .fa-chevron-circle-down:before { - content: "\f13a"; } + content: ""; } .fa-html5:before { - content: "\f13b"; } + content: ""; } .fa-css3:before { - content: "\f13c"; } + content: ""; } .fa-anchor:before { - content: "\f13d"; } + content: ""; } .fa-unlock-alt:before { - content: "\f13e"; } + content: ""; } .fa-bullseye:before { - content: "\f140"; } + content: ""; } .fa-ellipsis-h:before { - content: "\f141"; } + content: ""; } .fa-ellipsis-v:before { - content: "\f142"; } + content: ""; } .fa-rss-square:before { - content: "\f143"; } + content: ""; } .fa-play-circle:before { - content: "\f144"; } + content: ""; } .fa-ticket:before { - content: "\f145"; } + content: ""; } .fa-minus-square:before { - content: "\f146"; } + content: ""; } .fa-minus-square-o:before { - content: "\f147"; } + content: ""; } .fa-level-up:before { - content: "\f148"; } + content: ""; } .fa-level-down:before { - content: "\f149"; } + content: ""; } .fa-check-square:before { - content: "\f14a"; } + content: ""; } .fa-pencil-square:before { - content: "\f14b"; } + content: ""; } .fa-external-link-square:before { - content: "\f14c"; } + content: ""; } .fa-share-square:before { - content: "\f14d"; } + content: ""; } .fa-compass:before { - content: "\f14e"; } + content: ""; } .fa-toggle-down:before, .fa-caret-square-o-down:before { - content: "\f150"; } + content: ""; } .fa-toggle-up:before, .fa-caret-square-o-up:before { - content: "\f151"; } + content: ""; } .fa-toggle-right:before, .fa-caret-square-o-right:before { - content: "\f152"; } + content: ""; } .fa-euro:before, .fa-eur:before { - content: "\f153"; } + content: ""; } .fa-gbp:before { - content: "\f154"; } + content: ""; } .fa-dollar:before, .fa-usd:before { - content: "\f155"; } + content: ""; } .fa-rupee:before, .fa-inr:before { - content: "\f156"; } + content: ""; } .fa-cny:before, .fa-rmb:before, .fa-yen:before, .fa-jpy:before { - content: "\f157"; } + content: ""; } .fa-ruble:before, .fa-rouble:before, .fa-rub:before { - content: "\f158"; } + content: ""; } .fa-won:before, .fa-krw:before { - content: "\f159"; } + content: ""; } .fa-bitcoin:before, .fa-btc:before { - content: "\f15a"; } + content: ""; } .fa-file:before { - content: "\f15b"; } + content: ""; } .fa-file-text:before { - content: "\f15c"; } + content: ""; } .fa-sort-alpha-asc:before { - content: "\f15d"; } + content: ""; } .fa-sort-alpha-desc:before { - content: "\f15e"; } + content: ""; } .fa-sort-amount-asc:before { - content: "\f160"; } + content: ""; } .fa-sort-amount-desc:before { - content: "\f161"; } + content: ""; } .fa-sort-numeric-asc:before { - content: "\f162"; } + content: ""; } .fa-sort-numeric-desc:before { - content: "\f163"; } + content: ""; } .fa-thumbs-up:before { - content: "\f164"; } + content: ""; } .fa-thumbs-down:before { - content: "\f165"; } + content: ""; } .fa-youtube-square:before { - content: "\f166"; } + content: ""; } .fa-youtube:before { - content: "\f167"; } + content: ""; } .fa-xing:before { - content: "\f168"; } + content: ""; } .fa-xing-square:before { - content: "\f169"; } + content: ""; } .fa-youtube-play:before { - content: "\f16a"; } + content: ""; } .fa-dropbox:before { - content: "\f16b"; } + content: ""; } .fa-stack-overflow:before { - content: "\f16c"; } + content: ""; } .fa-instagram:before { - content: "\f16d"; } + content: ""; } .fa-flickr:before { - content: "\f16e"; } + content: ""; } .fa-adn:before { - content: "\f170"; } + content: ""; } .fa-bitbucket:before { - content: "\f171"; } + content: ""; } .fa-bitbucket-square:before { - content: "\f172"; } + content: ""; } .fa-tumblr:before { - content: "\f173"; } + content: ""; } .fa-tumblr-square:before { - content: "\f174"; } + content: ""; } .fa-long-arrow-down:before { - content: "\f175"; } + content: ""; } .fa-long-arrow-up:before { - content: "\f176"; } + content: ""; } .fa-long-arrow-left:before { - content: "\f177"; } + content: ""; } .fa-long-arrow-right:before { - content: "\f178"; } + content: ""; } .fa-apple:before { - content: "\f179"; } + content: ""; } .fa-windows:before { - content: "\f17a"; } + content: ""; } .fa-android:before { - content: "\f17b"; } + content: ""; } .fa-linux:before { - content: "\f17c"; } + content: ""; } .fa-dribbble:before { - content: "\f17d"; } + content: ""; } .fa-skype:before { - content: "\f17e"; } + content: ""; } .fa-foursquare:before { - content: "\f180"; } + content: ""; } .fa-trello:before { - content: "\f181"; } + content: ""; } .fa-female:before { - content: "\f182"; } + content: ""; } .fa-male:before { - content: "\f183"; } + content: ""; } .fa-gittip:before { - content: "\f184"; } + content: ""; } .fa-sun-o:before { - content: "\f185"; } + content: ""; } .fa-moon-o:before { - content: "\f186"; } + content: ""; } .fa-archive:before { - content: "\f187"; } + content: ""; } .fa-bug:before { - content: "\f188"; } + content: ""; } .fa-vk:before { - content: "\f189"; } + content: ""; } .fa-weibo:before { - content: "\f18a"; } + content: ""; } .fa-renren:before { - content: "\f18b"; } + content: ""; } .fa-pagelines:before { - content: "\f18c"; } + content: ""; } .fa-stack-exchange:before { - content: "\f18d"; } + content: ""; } .fa-arrow-circle-o-right:before { - content: "\f18e"; } + content: ""; } .fa-arrow-circle-o-left:before { - content: "\f190"; } + content: ""; } .fa-toggle-left:before, .fa-caret-square-o-left:before { - content: "\f191"; } + content: ""; } .fa-dot-circle-o:before { - content: "\f192"; } + content: ""; } .fa-wheelchair:before { - content: "\f193"; } + content: ""; } .fa-vimeo-square:before { - content: "\f194"; } + content: ""; } .fa-turkish-lira:before, .fa-try:before { - content: "\f195"; } + content: ""; } .fa-plus-square-o:before { - content: "\f196"; } + content: ""; } ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu, div.navlogo, ul.navlist li, div.footer-left, div.footer-left p, div.footer-center, a.headerButton, a.button-gui, div .tile, div .bigtile, div .tile a span.add-Icon, div .bigtile a span.add-Icon, div.centralContent, .contentDiv li, div.dropdownInner ul, .search-field, .fixedDropdown .notificationItemContent, .fixedDropdown .notificationItem i, .innerDropdownInnerUL, .dashboard-large-chart .dashboard-large-chart-inner, .dashboard-small-chart .dashboard-small-chart-inner, .dashboard-medium-chart, .dashboard-tendency-container, .dashboard-bar-chart-container, .dashboard-large-chart, .dashboard-small-chart, .dashboard-sub-bar .dashboard-sub-bar-title, .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart, .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart, .dashboard-medium-chart .dashboard-interior-chart, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency .dashboard-subtitle-bar, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency .dashboard-figure, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-chart, .dashboard-legend, .dashboard-sub-bar, .modal-chart-detail, .modal-chart-detail .modal-body, .modal-chart-detail .modal-dashboard-legend, .modal-chart-detail .modal-inner-detail, .dashboard-half-height-legend, .dashboard-title-bar .dashboard-half-title-bar, .dashboardModal, .pagination-line li a { float: left; } @@ -1388,7 +1384,7 @@ div.tileList:after, div.resizecontainer:after, div.headerBar > div.headerButtonB nav.navbar, footer.footer { background-color: #333232; - color: white; + color: #fff; left: 0; position: fixed; right: 0; @@ -1436,12 +1432,12 @@ nav.navbar, footer.footer { background-color: #3a322e; } .button-header, a.headerButton, a.button-gui { - background-color: #dddddd; - border: 1px solid #222222; - color: #555555; } + background-color: #ddd; + border: 1px solid #222; + color: #555; } .button-header:hover, a.headerButton:hover, a.button-gui:hover, .button-header:focus, a.headerButton:focus, a.button-gui:focus { - background-color: white; - color: black; } + background-color: #fff; + color: #000; } .button-notification { background-color: #faa020; } @@ -1449,15 +1445,15 @@ nav.navbar, footer.footer { background-color: #f87c0f; } .button-inactive { - background-color: lightgray; } + background-color: #d3d3d3; } .button-inactive:hover, .button-inactive:focus { - background-color: gray; } + background-color: #808080; } ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - background-color: white; + background-color: #fff; border-color: rgba(0, 0, 0, 0.2); border-style: solid; border-width: 1px; @@ -1474,7 +1470,7 @@ ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu { white-space: nowrap; width: 100%; } ul.link-dropdown-menu li.dropdown-header, ul.user-dropdown-menu li.dropdown-header, ul.gv-dropdown-menu li.dropdown-header { - color: #999999; + color: #999; font-size: 15px; font-weight: 600; font-variant: small-caps; @@ -1506,7 +1502,7 @@ ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu { border-style: solid; border-color: transparent; border-top: none; - border-bottom-color: white; + border-bottom-color: #fff; display: inline-block; content: ''; right: 8px; @@ -1525,7 +1521,7 @@ nav.navbar { top: 0; } nav.navbar .nav > .active > a { background-color: #8aa051; - color: white; + color: #fff; -webkit-box-shadow: 0 0 0 transparent inset; -moz-box-shadow: 0 0 0 transparent inset; box-shadow: 0 0 0 transparent inset; } @@ -1533,7 +1529,7 @@ nav.navbar { background-color: #333232; } nav.navbar .nav > li > a:hover { background-color: #8aa051; - color: white; } + color: #fff; } div.navlogo { margin-left: 5px; @@ -1569,10 +1565,10 @@ ul.navlist { ul.navlist li.dropdown-item a { display: block; } ul.navlist li.dropdown-item a:hover { - color: white; } + color: #fff; } a.tab { - color: white; + color: #fff; display: block; padding-top: 9px; padding-left: 10px; @@ -1597,7 +1593,7 @@ ul.gv-dropdown-menu { ul.gv-dropdown-menu li a { padding: 0; } ul.gv-dropdown-menu li a label { - color: white; + color: #fff; padding-left: 5px; } ul.gv-dropdown-menu li a:focus { background-color: #8aa051 !important; @@ -1612,7 +1608,7 @@ ul.gv-dropdown-menu { .caret { border-left: 5px solid transparent; - border-top: 5px solid white; + border-top: 5px solid #fff; border-right: 5px solid transparent; content: ''; display: inline-block; @@ -1649,12 +1645,12 @@ footer.footer { div.footer-left { background: none repeat scroll 0 0 #333232; - color: white; + color: #fff; width: 45%; } div.footer-center { background: none repeat scroll 0 0 #333232; - color: white; + color: #fff; width: 10%; } div.footer-center p:hover { cursor: pointer; } @@ -1664,7 +1660,7 @@ div.footer-right { color: #333232; width: 45%; } div.footer-right p { - color: white; } + color: #fff; } div.footer-right i { color: #da4f49; font-size: 18px; } @@ -1688,7 +1684,7 @@ div.footer-right { .button-neutral, .button-primary, .button-notification, .button-success, .button-danger, .button-warning, .button-inactive, .button-close { border: 0; - color: white; + color: #fff; margin-left: 10px; padding: 5px 16px; } @@ -1759,9 +1755,9 @@ a.headerButton { font-weight: bold; } a.headerButton.activated { background-color: #788f3d; - color: white; } + color: #fff; } a.headerButton.activated:hover { - background-color: white; + background-color: #fff; color: #788f3d; } div.toolbox { @@ -1773,7 +1769,7 @@ div.toolbox { position: absolute; } div.toolbox div.gv_action_button { background-color: #333232; - color: white; + color: #fff; height: 50px; margin-bottom: 2px; margin-top: 2px; @@ -1949,7 +1945,7 @@ a.button-gui { border-radius: 3px; background-color: #f1f1f1; border: 1px solid rgba(0, 0, 0, 0.1875); - color: #333333; + color: #333; font-size: 20px; font-weight: 300; margin: 0; @@ -1966,7 +1962,7 @@ a.button-gui { -webkit-transition-timing-function: ease-in; } .clusterDownBtn button.green { background-color: #617e2b; - color: white; } + color: #fff; } .clusterDownBtn button.green:hover { background-color: #8ba142; } @@ -2016,7 +2012,7 @@ div .tile, div .bigtile { line-height: 1.2; } div .tile h5, div .bigtile h5 { background: #686766; - color: white; + color: #fff; font-size: 12px; margin: 0; overflow: hidden !important; @@ -2051,7 +2047,7 @@ div .tile, div .bigtile { div .tile .unloaded div, div .bigtile .unloaded div { border-bottom: 16px solid #ff8f35; } div .tile .deleted div, div .bigtile .deleted div { - border-bottom: 16px solid #770000; } + border-bottom: 16px solid #700; } div .tile div.tileBadge, div .bigtile div.tileBadge { bottom: 29px; font-size: 11px; @@ -2072,6 +2068,8 @@ div .tile, div .bigtile { height: 0; padding-left: 4px; padding-right: 9px; } + div .tile div.tileBadge span div.corneredBadge.loading, div .bigtile div.tileBadge span div.corneredBadge.loading { + border-bottom-color: #ff8f35; } div .tile div.tileBadge span div.corneredBadge.loaded, div .bigtile div.tileBadge span div.corneredBadge.loaded { border-bottom-color: #8aa051; } div .tile div.tileBadge span div.corneredBadge.unloaded, div .bigtile div.tileBadge span div.corneredBadge.unloaded { @@ -2158,7 +2156,7 @@ div.resizecontainer { height: 195px; width: 58px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 10px; font-weight: 400; } @@ -2339,7 +2337,7 @@ div.resizecontainer { height: 195px; width: 138px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 10px; font-weight: 400; } @@ -2520,7 +2518,7 @@ div.resizecontainer { height: 195px; width: 218px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 10px; font-weight: 400; } @@ -2701,7 +2699,7 @@ div.resizecontainer { height: 232px; width: 298px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 11px; font-weight: 400; } @@ -2879,7 +2877,7 @@ div.resizecontainer { height: 267px; width: 378px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 13px; font-weight: 400; } @@ -3057,7 +3055,7 @@ div.resizecontainer { height: 297px; width: 458px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 13px; font-weight: 400; } @@ -3235,7 +3233,7 @@ div.resizecontainer { height: 337px; width: 538px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 14px; font-weight: 400; } @@ -3413,7 +3411,7 @@ div.resizecontainer { height: 397px; width: 618px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 14px; font-weight: 400; } @@ -3591,7 +3589,7 @@ div.resizecontainer { height: 297px; width: 698px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 15px; font-weight: 400; } @@ -3769,7 +3767,7 @@ div.resizecontainer { height: 297px; width: 778px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 15px; font-weight: 400; } @@ -3947,7 +3945,7 @@ div.resizecontainer { height: 297px; width: 858px; } .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-axis text { - fill: #666666; + fill: #666; font-size: 15px; font-weight: 400; } @@ -4130,7 +4128,7 @@ div.centralContent { font-size: 20px; } .icon_arangodb_info { - color: #333333; + color: #333; font-size: 23px; } li a [class^="icon_arangodb"], @@ -4141,7 +4139,7 @@ li a [class*=" icon_arangodb"] { top: 2px; } div.headerDropdown { - background-color: white; + background-color: #fff; display: none; padding: 10px; position: relative; @@ -4168,14 +4166,14 @@ div.dropdownInner { position: relative; width: auto; } div.dropdownInner > .nav-header { - color: black; + color: #000; font-size: 13px; font-weight: 400; } div.dropdownInner > label { - color: black; + color: #000; font-weight: 300; } div.dropdownInner ul { - border-left: 1px solid black; + border-left: 1px solid #000; display: inline; margin-top: 10px; min-height: 105px; @@ -4183,11 +4181,11 @@ div.dropdownInner { div.dropdownInner ul:first-of-type { border: 0; } div.dropdownInner ul label { - color: black; + color: #000; padding-left: 35px; } div.queryline { - color: black; + color: #000; height: 35px; } div.queryline .textDiv { margin-right: 10px; @@ -4196,7 +4194,7 @@ div.queryline { div.queryline input { margin-bottom: 5px; } div.queryline.querylineAdd span { - color: white; + color: #fff; padding-left: 10px; position: relative; top: -21px; } @@ -4212,7 +4210,7 @@ div.queryline { -webkit-border-radius: 0; border-radius: 0; background-color: #333232; - color: white; + color: #fff; display: none; left: 0; position: absolute; @@ -4220,7 +4218,7 @@ div.queryline { width: 247px; } div.dropdownImport { - background-color: white; + background-color: #fff; display: none; padding-top: 10px; padding-left: 10px; @@ -4304,7 +4302,7 @@ input.search-input { div.headerBar { background-color: #686766; - color: white; + color: #fff; font-size: 16px; height: 36px; margin-bottom: 5px; @@ -4339,7 +4337,7 @@ div.headerBar { background: url("../img/check_radio_sheet.png") -57px top no-repeat; } div.headerBar a.arangoHeader { - color: white; + color: #fff; font-size: 16px; left: 5px; position: relative; @@ -4353,7 +4351,7 @@ div.headerBar > div.breadcrumb { padding-left: 5px !important; } div.breadcrumb a.disabledBread { - color: white; } + color: #fff; } .arangoHeader { font-weight: 400; } @@ -4379,7 +4377,7 @@ div.breadcrumb a.disabledBread { padding-right: 10px; padding-top: 4px; } .modal-header .arangoHeader, .modal-dashboard-header .arangoHeader { - color: white; + color: #fff; font-size: 16px; left: 5px; position: relative; @@ -4387,7 +4385,7 @@ div.breadcrumb a.disabledBread { .modal-header a, .modal-dashboard-header a { top: 2px !important; } .modal-header .close, .modal-dashboard-header .close { - color: white; + color: #fff; font-weight: 300; margin-top: 2px; opacity: .5; } @@ -4440,7 +4438,7 @@ div.breadcrumb a.disabledBread { position: absolute; right: 12px; } .modal-body .icon_arangodb_info:hover { - color: black; } + color: #000; } .modal-body .collapse { margin-right: -14px; position: relative; } @@ -4450,7 +4448,7 @@ div.breadcrumb a.disabledBread { padding-left: 0; padding-right: 0; } .modal-body .accordion-toggle span b.caret { - border-top-color: black; + border-top-color: #000; float: right; margin-top: 5px; } .modal-body .accordion-toggle.collapsed span b.caret { @@ -4494,7 +4492,7 @@ div.breadcrumb a.disabledBread { box-shadow: none; background: transparent; border: 0; - color: white; } + color: #fff; } .waitModalBackdrop { opacity: .7 !important; } @@ -4503,7 +4501,7 @@ div.breadcrumb a.disabledBread { color: #736b68; font-size: 20px; } .modalTooltips span:hover { - color: black; } + color: #000; } pre.gv-object-view { text-align: left; @@ -4562,17 +4560,17 @@ pre.gv-object-view { margin-top: 1px; width: 26px; } .navlogo .stat_cpu path { - fill: #aaaa00; } + fill: #aa0; } .navlogo .stat_ram { height: 26px; width: 26px; } .navlogo .stat_ram path { - fill: #007700; } + fill: #070; } .navlogo .stat_req { height: 22px; width: 22px; } .navlogo .stat_req path { - fill: #aaaa00; } + fill: #aa0; } .fixedDropdown { -moz-border-radius: 0 !important; @@ -4600,7 +4598,7 @@ pre.gv-object-view { .fixedDropdown button { margin-right: 5px; } .fixedDropdown .notificationItem { - color: black; } + color: #000; } .fixedDropdown .notificationItem .notificationItemTitle:hover { color: #000; cursor: default; } @@ -4611,7 +4609,7 @@ pre.gv-object-view { right: 4px; top: -9px; } .fixedDropdown .notificationItem i:hover { - color: black; } + color: #000; } .innerDropdownInnerUL { border-bottom: 1px solid rgba(0, 0, 0, 0.2); @@ -4636,13 +4634,13 @@ pre.gv-object-view { text-align: center; width: 24px; } #stat_hd #stat_hd_counter { - color: white; + color: #fff; line-height: 24px; margin-left: 0; } .fullNotification { - background-color: #cc0000 !important; - border: 2px solid #cc0000 !important; } + background-color: #c00 !important; + border: 2px solid #c00 !important; } .contentButtons { clear: both; @@ -4658,21 +4656,21 @@ pre.gv-object-view { .contentTables thead { text-align: left; } .contentTables thead tr { - background-color: white; + background-color: #fff; border-bottom: 1px solid #c2c2c2; } .contentTables tbody tr:nth-child(odd) { background-color: #d9d9d9; } .contentTables tbody tr:nth-child(even) { - background-color: white; } + background-color: #fff; } .contentTables tr.contentRowActive { background-color: #bdcc92 !important; font-weight: 400; } .contentTables tr.contentRowActive a { - color: black !important; } + color: #000 !important; } .contentTables tr.contentRowActive span { display: none; } .contentTables tr.contentRowInactive a { - color: black !important; } + color: #000 !important; } .contentTables .dbThFirst { width: 90%; } .contentTables .dbThSecond { @@ -4690,7 +4688,7 @@ pre.gv-object-view { width: 5%; } .user-menu-img { - background-color: lightgray; + background-color: #d3d3d3; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -4705,7 +4703,7 @@ pre.gv-object-view { .index-tooltip { color: #736b68; } .index-tooltip:hover { - color: black; } + color: #000; } .index-tooltip span.arangoicon { font-size: 18px !important; } @@ -4721,7 +4719,7 @@ pre.gv-object-view { white-space: nowrap; } .dashboard-large-chart .dashboard-large-chart-inner, .dashboard-small-chart .dashboard-small-chart-inner, .dashboard-medium-chart, .dashboard-tendency-container, .dashboard-bar-chart-container { - border-left: 0 solid black; } + border-left: 0 solid #000; } .dashboard-large-chart .dashboard-large-chart-inner:first-child, .dashboard-small-chart .dashboard-small-chart-inner:first-child, .dashboard-medium-chart:first-child, .dashboard-tendency-container:first-child, .dashboard-bar-chart-container:first-child { margin-left: 0; } @@ -4738,7 +4736,7 @@ pre.gv-object-view { .dashboard-large-chart { margin-right: 12px; } .dashboard-large-chart .dashboard-large-chart-inner { - background-color: white; + background-color: #fff; border-left: 5px solid #e1e1e1; border-right: 5px solid #e1e1e1; border-top: 5px solid #e1e1e1; @@ -4747,7 +4745,7 @@ pre.gv-object-view { margin-bottom: 0; } .dashboard-small-chart .dashboard-small-chart-inner { - background-color: white; + background-color: #fff; border-left: 5px solid #e1e1e1; border-right: 5px solid #e1e1e1; border-top: 5px solid #e1e1e1; } @@ -4757,7 +4755,7 @@ pre.gv-object-view { stroke-width: 1px; } .dashboard-medium-chart { - background-color: white; + background-color: #fff; border-left: 5px solid #e1e1e1; border-right: 5px solid #e1e1e1; border-top: 5px solid #e1e1e1; @@ -4786,12 +4784,12 @@ pre.gv-object-view { stroke-width: 1.5px; } .dashboard-tendency-container .dashboard-tendency-chart { - background-color: white; + background-color: #fff; border-left: 5px solid #e1e1e1; border-right: 5px solid #e1e1e1; border-top: 5px solid #e1e1e1; } .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency { - background-color: white; + background-color: #fff; margin-top: 5px; padding: 0 8px; } .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency:first-child { @@ -4803,7 +4801,7 @@ pre.gv-object-view { text-align: center; } .dashboard-bar-chart-container .dashboard-bar-chart { - background-color: white; + background-color: #fff; border-left: 5px solid #e1e1e1; border-right: 5px solid #e1e1e1; border-top: 5px solid #e1e1e1; } @@ -4824,7 +4822,7 @@ pre.gv-object-view { .dashboard-sub-bar { background-color: #686766; - color: white; + color: #fff; height: 24px; line-height: 24px; margin: 0; @@ -4845,14 +4843,14 @@ pre.gv-object-view { .dashboard-title-bar { background-color: #686766; - color: white; + color: #fff; font-size: 14.5px; font-weight: 400; height: 30px; line-height: 30px; padding: 0 5px 0 10px; } .dashboard-title-bar .dashboard-half-title-bar { - border-left: 1px solid black; + border-left: 1px solid #000; margin-left: -1px; width: 50%; } .dashboard-title-bar .dashboard-half-title-bar:first-child { @@ -4865,7 +4863,7 @@ pre.gv-object-view { margin-right: 0; } .dygraph-axis-label.dygraph-axis-label-y, .dygraph-axis-label.dygraph-axis-label-x { - color: #666666; } + color: #666; } .dashboardModal { -moz-border-radius: 8px !important; @@ -4880,12 +4878,12 @@ pre.gv-object-view { width: 90% !important; } #dashboardHttpGroup { - border: 6px solid black; + border: 6px solid #000; height: 100%; width: 100%; } #dashboardDetailedChart { - border: 1px solid black; + border: 1px solid #000; height: 300px; width: 100%; } #dashboardDetailedChart .dygraph-axis-label-y { @@ -4904,7 +4902,7 @@ pre.gv-object-view { text-align: left; } .dashboardChart { - background-color: white; + background-color: #fff; border: 1px solid rgba(0, 0, 0, 0.2); float: left; height: 210px; @@ -4913,7 +4911,7 @@ pre.gv-object-view { width: 31%; } .dygraph-label.dygraph-title { - color: black; + color: #000; font-family: 'Open Sans', sans-serif; font-size: 15px; font-weight: 400; @@ -5002,8 +5000,8 @@ pre.gv-object-view { width: 75% !important; } .query-output { - background-color: white; - border: 1px solid silver; + background-color: #fff; + border: 1px solid #c0c0c0; border-top-width: 0; height: 200px; margin-bottom: 10px; @@ -5028,7 +5026,7 @@ pre.gv-object-view { overflow: hidden; width: 220px; } .styled-select select { - background: white; + background: #fff; border: 0; border-radius: 0; font-size: 14px; @@ -5079,7 +5077,7 @@ pre.gv-object-view { width: 100%; } .output-toolbar { - border-color: silver; + border-color: #c0c0c0; border-top: 0; position: relative; width: auto; } @@ -5120,7 +5118,7 @@ pre.gv-object-view { margin-top: 1px; } .query-dropdown-in { - background-color: white; + background-color: #fff; padding: 10px; } .query-dropdown-in a { color: #686766; @@ -5204,7 +5202,7 @@ pre.gv-object-view { width: auto !important; } .arango-tab { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; list-style: none; margin-bottom: -1px; margin-left: 0; @@ -5216,8 +5214,8 @@ pre.gv-object-view { border-radius: 0; background-color: #f1f0ee; border: 1px solid transparent; - border-bottom-color: #888888; - color: black; + border-bottom-color: #888; + color: #000; display: block; font-size: 13px; line-height: 20px; @@ -5233,16 +5231,16 @@ pre.gv-object-view { position: relative; z-index: 900; } .arango-tab li.active a { - background: white; - border-bottom-color: white; - border-left-color: #888888; - border-right-color: #888888; - border-top-color: #888888; + background: #fff; + border-bottom-color: #fff; + border-left-color: #888; + border-right-color: #888; + border-top-color: #888; height: 21px; margin-top: -1px; } .jsoneditor { - background-color: white !important; + background-color: #fff !important; border: 1px solid rgba(0, 0, 0, 0.2) !important; } .jsoneditor .menu { background-color: #686766 !important; @@ -5251,7 +5249,7 @@ pre.gv-object-view { border: 0 !important; margin: 3px !important; } .jsoneditor .search .results { - color: white !important; + color: #fff !important; margin-top: 3px !important; } .show-save-state { @@ -5277,10 +5275,10 @@ pre.gv-object-view { .pagination-line li a:hover, .pagination-line li.active a, .pagination-line li.active span { background-color: #8f8d8c; - color: white; } + color: #fff; } .pagination-line li a { - background-color: white; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; border-left-width: 0; font-size: 11.9px; line-height: 20px; @@ -5302,7 +5300,7 @@ pre.gv-object-view { .pagination-line li a { border-width: 0; } .pagination-line li span { - color: black; + color: #000; font-size: 14px; position: relative; top: 2px; } @@ -5314,15 +5312,15 @@ pre.gv-object-view { box-shadow: 0; background: #8f8d8c; border: 0; - color: black; + color: #000; height: 20px; position: relative; width: 14px; } .pagination-line li.disabled:last-child a, .pagination-line li.disabled:last-child span, .pagination-line li.disabled:first-child a, .pagination-line li.disabled:first-child span { - background-color: #777777; - color: #666666; + background-color: #777; + color: #666; cursor: default; pointer-events: none; } @@ -5347,8 +5345,8 @@ pre.gv-object-view { border: 0; } .accordion-heading a { - border: 1px solid #cccccc; - color: black; + border: 1px solid #ccc; + color: #000; font-weight: 400; width: 397px !important; } @@ -5356,7 +5354,7 @@ pre.gv-object-view { margin-top: 13px; } .replShell { - background-color: white; + background-color: #fff; float: left; height: 100%; min-width: 100px; @@ -5369,42 +5367,42 @@ pre.gv-object-view { border-top: 1px solid #a0a0a0; } .jqconsole { - background-color: black; + background-color: #000; border-radius: 0; padding: 10px; } .jqconsole-header { - color: white; } + color: #fff; } .jserror { - color: #ff0066; + color: #f06; margin-left: -10px; } .jssuccess { - color: #66ff00; } + color: #6f0; } .jqconsole-cursor { - background-color: gray; } + background-color: #808080; } .jqconsole-blurred .jqconsole-header .jqconsole-cursor { color: #c4cccc; } .jqconsole-prompt { - color: #bb9911; } + color: #b91; } .jqconsole-old-prompt { - color: #ff6600; + color: #f60; font-weight: normal; } .jqconsole-input { - color: #dddd00; } + color: #dd0; } .jqconsole-old-input { - color: #bbbb00; + color: #bb0; font-weight: normal; } .jqconsole-output { - color: white; } + color: #fff; } .query-output .ace_gutter-cell { background-color: #f0f0f0; } @@ -5426,10 +5424,10 @@ pre.gv-object-view { border-bottom: 0 !important; padding-left: 5px !important; } .centralContent .api-actions .resource .heading h2 a { - color: black !important; + color: #000 !important; font-weight: 300 !important; } .centralContent .api-actions .active .heading h2 a { - color: black !important; } + color: #000 !important; } .centralContent .api-actions .endpoints { margin-right: 5px !important; } .centralContent .api-actions .endpoints .endpoint:last-child { @@ -5453,7 +5451,7 @@ pre.gv-object-view { background: none repeat scroll 0 0 #8f8d8c !important; border: medium none !important; box-shadow: none !important; - color: white !important; + color: #fff !important; float: right !important; font-size: 14px !important; font-weight: 300 !important; @@ -5514,16 +5512,16 @@ textarea, .crit-table-id thead, .warn-table-id thead { background-color: #f9f9f9; - border-top: 6px solid #888888 !important; + border-top: 6px solid #888 !important; text-align: center; } .log-table-id thead tr th, .info-table-id thead tr th, .debug-table-id thead tr th, .crit-table-id thead tr th, .warn-table-id thead tr th { - background-color: white !important; + background-color: #fff !important; border-bottom: 1px solid #c2c2c2; - border-top: 2px solid #888888; } + border-top: 2px solid #888; } .log-table-id .firstcol, .info-table-id .firstcol, .debug-table-id .firstcol, @@ -5586,7 +5584,7 @@ div.gv_zoom_widget { margin: 0 17px; width: 4px; } div.gv_zoom_widget a.ui-slider-handle { - background: white; + background: #fff; border-color: #686766; height: .5em; left: -.55em; @@ -5610,7 +5608,7 @@ div.gv_colour_list { padding: 2px 6px; } svg.graph-viewer { - background-color: white; + background-color: #fff; border: 1px solid rgba(0, 0, 0, 0.125); left: 74px; position: absolute; @@ -5738,9 +5736,9 @@ input.gv-radio-button { #infoTab a, #collectionTab a { background-color: #f1f0ee; - border-bottom: 1px solid #888888; + border-bottom: 1px solid #888; border-radius: 0 !important; - color: black; + color: #000; font-size: 13px !important; height: 21px; margin-bottom: -1px; @@ -5749,13 +5747,13 @@ input.gv-radio-button { #infoTab .active > a, #collectionTab .active > a { - background-color: white; - border-color: #888888 #888888 transparent !important; } + background-color: #fff; + border-color: #888 #888 transparent !important; } #tab-content-collection-info #info, #tab-content-collection-info .collection-info-figures, #tab-content-collection-info #index { - border-top: 1px solid #888888 !important; + border-top: 1px solid #888 !important; margin-left: 0 !important; padding-top: 10px; } @@ -5886,7 +5884,7 @@ input.gv-radio-button { float: left; font-size: 22px; margin-left: 10px; - margin-top: 6px; } + margin-top: 7px; } .hotkeysList .hotkeysLabel { clear: both; @@ -6124,3 +6122,5 @@ table .sorting { .totalDocuments:hover { color: #000; } + +/*# sourceMappingURL=generated.css.map */ diff --git a/js/common/modules/jslint.js b/js/common/modules/jslint.js index 7faaafc809..c5ef6640b6 100644 --- a/js/common/modules/jslint.js +++ b/js/common/modules/jslint.js @@ -83,8 +83,8 @@ function RunCommandLineTests (options) { var testResult = RunTest(file, options); result = result && testResult && testResult.passed; if (testResult && (! testResult.passed && testResult.errors)) { - for (var i = 0; i < testResult.errors.length; ++i) { - var err = testResult.errors[i]; + for (var j = 0; j < testResult.errors.length; ++j) { + var err = testResult.errors[j]; if (! err) { continue; } @@ -105,7 +105,6 @@ function RunCommandLineTests (options) { } } - internal.setUnitTestsResult(result); }