couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [37/50] [abbrv] couchdb commit: updated refs/heads/Update-Sidebar-Ui to d34dfae
Date Thu, 19 Jun 2014 06:02:54 GMT
Fauxton: Improve css and add fonts


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2c9c8235
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2c9c8235
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2c9c8235

Branch: refs/heads/Update-Sidebar-Ui
Commit: 2c9c8235475ef07177cbd5def01b72fe4aca618d
Parents: ffb1a11
Author: sean barclay <fudd1011@hotmail.com>
Authored: Wed Jun 4 22:14:46 2014 -0700
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Wed Jun 18 16:56:46 2014 +0200

----------------------------------------------------------------------
 src/fauxton/Gruntfile.js                        |    8 +
 .../addons/documents/assets/less/documents.less |    9 +-
 src/fauxton/assets/fonts/FontAwesome.otf        |  Bin 0 -> 61896 bytes
 src/fauxton/assets/fonts/Gemfile                |    5 +
 src/fauxton/assets/fonts/Gemfile.lock           |   31 +
 src/fauxton/assets/fonts/README.md              |   39 +
 src/fauxton/assets/fonts/fauxtonicon.eot        |  Bin 0 -> 17280 bytes
 src/fauxton/assets/fonts/fauxtonicon.svg        |  642 ++++++
 src/fauxton/assets/fonts/fauxtonicon.ttf        |  Bin 0 -> 17092 bytes
 src/fauxton/assets/fonts/fauxtonicon.woff       |  Bin 0 -> 9876 bytes
 .../assets/fonts/fontawesome-webfont.eot        |  Bin 0 -> 37405 bytes
 .../assets/fonts/fontawesome-webfont.svg        |  399 ++++
 .../assets/fonts/fontawesome-webfont.ttf        |  Bin 0 -> 79076 bytes
 .../assets/fonts/fontawesome-webfont.woff       |  Bin 0 -> 43572 bytes
 src/fauxton/assets/fonts/fontcustom.yml         |   51 +
 .../fonts/styleguide/fauxtonicon-preview.html   | 1928 ++++++++++++++++++
 src/fauxton/assets/fonts/templates/icons.less   |   30 +
 src/fauxton/assets/icons/activetasks.svg        |    8 +
 src/fauxton/assets/icons/arrow-box-down.svg     |    8 +
 src/fauxton/assets/icons/arrow-box-up.svg       |    8 +
 src/fauxton/assets/icons/arrow_left.svg         |    7 +
 src/fauxton/assets/icons/arrow_right.svg        |    7 +
 src/fauxton/assets/icons/arrows-cw.svg          |    8 +
 src/fauxton/assets/icons/article.svg            |    8 +
 src/fauxton/assets/icons/attention-alt.svg      |    8 +
 src/fauxton/assets/icons/attention-circled.svg  |    8 +
 src/fauxton/assets/icons/block.svg              |    8 +
 .../assets/icons/bookmark-ribbon-wplus.svg      |    8 +
 src/fauxton/assets/icons/bookmark.svg           |    8 +
 src/fauxton/assets/icons/burger.svg             |    8 +
 src/fauxton/assets/icons/cancel-circled.svg     |    8 +
 src/fauxton/assets/icons/cancel-circled2.svg    |    8 +
 src/fauxton/assets/icons/cancel.svg             |    8 +
 src/fauxton/assets/icons/carrot.svg             | 1334 ++++++++++++
 src/fauxton/assets/icons/check.svg              | 1310 ++++++++++++
 src/fauxton/assets/icons/circle-check.svg       | 1343 ++++++++++++
 src/fauxton/assets/icons/circle-empty.svg       |    8 +
 src/fauxton/assets/icons/circle-minus.svg       | 1355 ++++++++++++
 src/fauxton/assets/icons/circle-plus.svg        | 1312 ++++++++++++
 src/fauxton/assets/icons/circle-x.svg           | 1223 +++++++++++
 src/fauxton/assets/icons/clipboard.svg          |    8 +
 src/fauxton/assets/icons/clock.svg              |    8 +
 src/fauxton/assets/icons/cog.svg                |    8 +
 src/fauxton/assets/icons/collapse.svg           |    8 +
 src/fauxton/assets/icons/cw.svg                 |    8 +
 src/fauxton/assets/icons/dashboard.svg          |    8 +
 src/fauxton/assets/icons/database.svg           |    8 +
 src/fauxton/assets/icons/document.svg           |    8 +
 src/fauxton/assets/icons/documents.svg          |    8 +
 src/fauxton/assets/icons/dot-circled.svg        |    8 +
 src/fauxton/assets/icons/down-1.svg             |    8 +
 src/fauxton/assets/icons/down-circled.svg       |    8 +
 src/fauxton/assets/icons/down-dir.svg           |    8 +
 src/fauxton/assets/icons/down-open.svg          |    8 +
 src/fauxton/assets/icons/down.svg               |    8 +
 src/fauxton/assets/icons/drop-down-dots.svg     |    8 +
 src/fauxton/assets/icons/exchange.svg           |    8 +
 src/fauxton/assets/icons/expand.svg             |    8 +
 src/fauxton/assets/icons/eye.svg                |    8 +
 src/fauxton/assets/icons/help-circled.svg       |    8 +
 src/fauxton/assets/icons/help.svg               |    8 +
 src/fauxton/assets/icons/info-circled.svg       |    8 +
 src/fauxton/assets/icons/json.svg               |    8 +
 src/fauxton/assets/icons/key.svg                |    8 +
 src/fauxton/assets/icons/left-1.svg             |    8 +
 src/fauxton/assets/icons/left-circled.svg       |    8 +
 src/fauxton/assets/icons/left-dir.svg           |    8 +
 src/fauxton/assets/icons/left-open.svg          |    8 +
 src/fauxton/assets/icons/left.svg               |    8 +
 src/fauxton/assets/icons/link.svg               |    8 +
 src/fauxton/assets/icons/list-alt.svg           |    8 +
 src/fauxton/assets/icons/lock.svg               |    8 +
 src/fauxton/assets/icons/log.svg                | 1328 ++++++++++++
 src/fauxton/assets/icons/mail-alt.svg           |    8 +
 src/fauxton/assets/icons/mail.svg               |    8 +
 src/fauxton/assets/icons/megaphone.svg          |    8 +
 src/fauxton/assets/icons/minus-circled.svg      |    8 +
 src/fauxton/assets/icons/minus-squared-alt.svg  |    8 +
 src/fauxton/assets/icons/minus-squared.svg      |    8 +
 src/fauxton/assets/icons/minus.svg              |    8 +
 src/fauxton/assets/icons/mixer.svg              |    8 +
 src/fauxton/assets/icons/new-database.svg       |    8 +
 src/fauxton/assets/icons/ok-circled-2.svg       |    8 +
 src/fauxton/assets/icons/ok-circled.svg         |    8 +
 src/fauxton/assets/icons/ok.svg                 |    8 +
 src/fauxton/assets/icons/paperclip.svg          | 1364 +++++++++++++
 src/fauxton/assets/icons/pencil.svg             |    8 +
 src/fauxton/assets/icons/picture.svg            |    8 +
 src/fauxton/assets/icons/play.svg               |    8 +
 src/fauxton/assets/icons/plus-circled.svg       |    8 +
 src/fauxton/assets/icons/plus-squared-alt.svg   |    8 +
 src/fauxton/assets/icons/plus-squared.svg       |    8 +
 src/fauxton/assets/icons/plus.svg               |    8 +
 src/fauxton/assets/icons/popin.svg              |    8 +
 src/fauxton/assets/icons/popout.svg             |    8 +
 src/fauxton/assets/icons/profile.svg            |    8 +
 src/fauxton/assets/icons/replicate.svg          |    8 +
 src/fauxton/assets/icons/reply-all.svg          |    8 +
 src/fauxton/assets/icons/reply.svg              |    8 +
 .../assets/icons/resize-full-reverse.svg        |    8 +
 src/fauxton/assets/icons/resize-full.svg        |    8 +
 .../assets/icons/resize-small-reverse.svg       |    8 +
 src/fauxton/assets/icons/resize-small.svg       |    8 +
 src/fauxton/assets/icons/right-1.svg            |    8 +
 src/fauxton/assets/icons/right-circled.svg      |    8 +
 src/fauxton/assets/icons/right-dir.svg          |    8 +
 src/fauxton/assets/icons/right-open.svg         |    8 +
 src/fauxton/assets/icons/right.svg              |    8 +
 src/fauxton/assets/icons/save.svg               |    8 +
 src/fauxton/assets/icons/search.svg             |    8 +
 .../assets/icons/sidenav-filter-function.svg    |   10 +
 src/fauxton/assets/icons/sidenav-info.svg       |   15 +
 .../assets/icons/sidenav-list-function.svg      |   12 +
 src/fauxton/assets/icons/sidenav-map-reduce.svg |   13 +
 src/fauxton/assets/icons/sidenav-search.svg     |   17 +
 .../assets/icons/sidenav-show-function.svg      |   13 +
 .../assets/icons/sidenav-update-function.svg    |   12 +
 src/fauxton/assets/icons/sitemap.svg            |    8 +
 src/fauxton/assets/icons/stats.svg              |    8 +
 src/fauxton/assets/icons/support.svg            |    8 +
 src/fauxton/assets/icons/swap-arrows.svg        | 1318 ++++++++++++
 src/fauxton/assets/icons/table.svg              |    8 +
 src/fauxton/assets/icons/trash.svg              |    8 +
 src/fauxton/assets/icons/up-1.svg               |    8 +
 src/fauxton/assets/icons/up-circled.svg         |    8 +
 src/fauxton/assets/icons/up-dir.svg             |    8 +
 src/fauxton/assets/icons/up-open.svg            |    8 +
 src/fauxton/assets/icons/up.svg                 |    8 +
 src/fauxton/assets/icons/user.svg               |    8 +
 src/fauxton/assets/icons/users.svg              |    8 +
 src/fauxton/assets/icons/wrench.svg             |    8 +
 src/fauxton/assets/icons/x.svg                  | 1223 +++++++++++
 src/fauxton/assets/img/FontAwesome.otf          |  Bin 61896 -> 0 bytes
 src/fauxton/assets/img/fontawesome-webfont.eot  |  Bin 37405 -> 0 bytes
 src/fauxton/assets/img/fontawesome-webfont.svg  |  399 ----
 src/fauxton/assets/img/fontawesome-webfont.ttf  |  Bin 79076 -> 0 bytes
 src/fauxton/assets/img/fontawesome-webfont.woff |  Bin 43572 -> 0 bytes
 src/fauxton/assets/img/fontcustom_fauxton.eot   |  Bin 7364 -> 0 bytes
 src/fauxton/assets/img/fontcustom_fauxton.svg   |  200 --
 src/fauxton/assets/img/fontcustom_fauxton.ttf   |  Bin 9636 -> 0 bytes
 src/fauxton/assets/img/fontcustom_fauxton.woff  |  Bin 4816 -> 0 bytes
 src/fauxton/assets/less/fauxton.less            |    2 +-
 src/fauxton/assets/less/icons.less              |  266 ++-
 src/fauxton/tasks/couchserver.js                |    2 +
 144 files changed, 17346 insertions(+), 649 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/2c9c8235/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index 8ffb2f8..73a3ea2 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -64,6 +64,7 @@ module.exports = function(grunt) {
           "dist/debug/css/fauxton.css": "assets/less/fauxton.less"
         }
       },
+      fonts: ["assets/fonts/*"],
       img: ["assets/img/**"],
       // used in concat:index_css to keep file ordering intact
       // fauxton.css should load first
@@ -86,6 +87,10 @@ module.exports = function(grunt) {
       if(fs.existsSync(imgPath)){
         theAssets.img.push(imgPath + "/**");
       }
+      var fontsPath = root + "/assets/fonts";
+      if(fs.existsSync(fontsPath)){
+        theAssets.fonts.push(fontsPath + "/**");
+      }
     });
     return theAssets;
   }();
@@ -324,6 +329,7 @@ module.exports = function(grunt) {
           {src: "dist/release/index.html", dest: "../../share/www/fauxton/index.html"},
           {src: ["**"], dest: "../../share/www/fauxton/js/", cwd:'dist/release/js/',  expand:
true},
           {src: ["**"], dest: "../../share/www/fauxton/img/", cwd:'dist/release/img/', expand:
true},
+          {src: ["**"], dest: "../../share/www/fauxton/fonts/", cwd:'dist/release/fonts/',
expand: true},
           {src: ["**"], dest: "../../share/www/fauxton/css/", cwd:"dist/release/css/", expand:
true}
         ]
       },
@@ -333,6 +339,7 @@ module.exports = function(grunt) {
           {src: "dist/debug/index.html", dest: "../../share/www/fauxton/index.html"},
           {src: ["**"], dest: "../../share/www/fauxton/js/", cwd:'dist/debug/js/',  expand:
true},
           {src: ["**"], dest: "../../share/www/fauxton/img/", cwd:'dist/debug/img/', expand:
true},
+          {src: ["**"], dest: "../../share/www/fauxton/fonts/", cwd:'dist/debug/fonts/',
expand: true},
           {src: ["**"], dest: "../../share/www/fauxton/css/", cwd:"dist/debug/css/", expand:
true}
         ]
       },
@@ -354,6 +361,7 @@ module.exports = function(grunt) {
       },
       debug:{
         files:[
+          {src: assets.fonts, dest: "dist/debug/fonts/", flatten: true, expand: true},
           {src: assets.img, dest: "dist/debug/img/", flatten: true, expand: true}
         ]
       }

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2c9c8235/src/fauxton/app/addons/documents/assets/less/documents.less
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/assets/less/documents.less b/src/fauxton/app/addons/documents/assets/less/documents.less
index b9dad2e..ca1f599 100644
--- a/src/fauxton/app/addons/documents/assets/less/documents.less
+++ b/src/fauxton/app/addons/documents/assets/less/documents.less
@@ -162,7 +162,6 @@ button.beautify {
 }
 
 .sidenav{
-  margin-bottom: 40px;
   .nav-list > .active > a{
     text-shadow: none;
     background-color: rgba(0, 0, 0, 0.05);
@@ -185,10 +184,12 @@ button.beautify {
   }
   li.nav-header {
     position: relative;
-    .accordion-body{
+    > .accordion-body{
       &.in {
         border-bottom: 1px solid #d3d7db;
       }
+    }
+    .accordion-body{
       color: #eee;
       margin-left: 0;
       li.active > a{
@@ -256,12 +257,14 @@ button.beautify {
         }
         .fonticon-play{
           font-size: 8px;
-          top: 11px;
+          top: 7px;
           left: 15px;
         }
         .fonticon:before{
           margin-right: 6px;
           font-size: 20px;
+          top: 3px;
+          position: relative;
         }
       }
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2c9c8235/src/fauxton/assets/fonts/FontAwesome.otf
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/FontAwesome.otf b/src/fauxton/assets/fonts/FontAwesome.otf
new file mode 100644
index 0000000..7012545
Binary files /dev/null and b/src/fauxton/assets/fonts/FontAwesome.otf differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2c9c8235/src/fauxton/assets/fonts/Gemfile
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/Gemfile b/src/fauxton/assets/fonts/Gemfile
new file mode 100644
index 0000000..3f6dd8a
--- /dev/null
+++ b/src/fauxton/assets/fonts/Gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'fontcustom', 
+:git => 'https://github.com/seanbarclay/fontcustom.git', 
+:branch => 'master'
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2c9c8235/src/fauxton/assets/fonts/Gemfile.lock
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/Gemfile.lock b/src/fauxton/assets/fonts/Gemfile.lock
new file mode 100644
index 0000000..bdee8ac
--- /dev/null
+++ b/src/fauxton/assets/fonts/Gemfile.lock
@@ -0,0 +1,31 @@
+GIT
+  remote: https://github.com/seanbarclay/fontcustom.git
+  revision: 1c3ad3d2633d3a8add39e8827115394e9ec02d88
+  branch: master
+  specs:
+    fontcustom (1.3.3)
+      json (~> 1.4)
+      listen (~> 1.0)
+      thor (~> 0.14)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.9.3)
+    json (1.8.1)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.3)
+      ffi (>= 0.5.0)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fontcustom!

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2c9c8235/src/fauxton/assets/fonts/README.md
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/README.md b/src/fauxton/assets/fonts/README.md
new file mode 100644
index 0000000..7deb80d
--- /dev/null
+++ b/src/fauxton/assets/fonts/README.md
@@ -0,0 +1,39 @@
+*WARNING:  this is a temporary solution for adding icons to the Icon Font. This will become
a grunt task eventually.*
+
+This is a temp solution till Fontcustom fixes this [BUG](https://github.com/FontCustom/fontcustom/issues/172)<br>
+
+### Installation
+
+Requires **Bundler.io**, **Ruby 1.9.2+**, **FontForge** with Python scripting.
+
+```sh
+# On Mac
+$ gem install bundler
+$ brew install fontforge eot-utils
+$ cd [LOCAL_COUCHDB_REPO]/src/fauxton/assets/fonts
+$ bundle
+```
+
+That should install the gem in a path like below:
+/Users/[USERNAME]/.rvm/gems/[RUBYVERSION]/bundler/gems/fontcustom
+
+Don't forget to update `fontcustom.yml` with the correct paths where it says `PUT_YOUR_PATH_HERE`.
+
+From there, you can run the command `$ fontcustom compile` to compile the svgs located in
the ./icons directory into updated fauxtonicon font files. 
+
+It's setup to generate the following 
+- an `icons.less` file [LOCAL_COUCHDB_REPO]/src/fauxton/assets/less
+- a `fauxtonicon-preview.html` preview [LOCAL_COUCHDB_REPO]/src/fauxton/assets/fonts/styleguide
+- font files in [LOCAL_COUCHDB_REPO]/src/fauxton/assets/fonts/
+  * `fauxtonicon.eot` 
+  * `fauxtonicon.svg`
+  * `fauxtonicon.ttf`
+  * `fauxtonicon.woff` 
+
+
+For more info on Fontcustom, check out their documenation: [Fontcustom documentation](https://github.com/FontCustom/fontcustom)
+
+For more info on Bundler, check out their documentation:  [Bundler documentation](http://bundler.io)
+
+
+[Licenses](https://github.com/FontCustom/fontcustom/blob/master/LICENSES.txt)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2c9c8235/src/fauxton/assets/fonts/fauxtonicon.eot
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/fauxtonicon.eot b/src/fauxton/assets/fonts/fauxtonicon.eot
new file mode 100644
index 0000000..b3768dd
Binary files /dev/null and b/src/fauxton/assets/fonts/fauxtonicon.eot differ


Mime
View raw message