From eee8c02a95a661a40a6c2cf1e6c93c22d751c298 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Wed, 31 Jul 2013 17:51:52 -0700 Subject: [PATCH 01/34] demo(tabs): update demo to Bootstrap3 --- src/tabs/docs/demo.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tabs/docs/demo.html b/src/tabs/docs/demo.html index b56bbbbc54..139a092703 100644 --- a/src/tabs/docs/demo.html +++ b/src/tabs/docs/demo.html @@ -1,9 +1,9 @@
Select a tab by setting active binding to true:
- - - + + +
@@ -13,7 +13,7 @@ - Select me for alert! + Select me for alert! I've got an HTML heading, and a select callback. Pretty cool! From a0bbd7f91229057ab1d2a12ebb53cc0035588222 Mon Sep 17 00:00:00 2001 From: Jon Jaques Date: Mon, 29 Jul 2013 01:16:55 -0500 Subject: [PATCH 02/34] demo(all): upgrade project to bs3.0.0-rc2 and get docs looking spiffy --- Gruntfile.js | 13 +++- misc/demo/assets/demo.css | 35 +++++++-- misc/demo/index.html | 155 +++++++++++++++++++------------------- 3 files changed, 114 insertions(+), 89 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2421eba643..eba3099543 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,7 +4,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-concat'); - grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-html2js'); @@ -17,7 +17,8 @@ module.exports = function(grunt) { grunt.initConfig({ ngversion: '1.0.8', - bsversion: '2.3.1', + bsversion: '3.0.2', + faversion: '3.2.1', modules: [],//to be filled in by build task pkg: grunt.file.readJSON('package.json'), dist: 'dist', @@ -29,6 +30,10 @@ module.exports = function(grunt) { all: 'angular.module("ui.bootstrap", ["ui.bootstrap.tpls", <%= srcModules %>]);' }, delta: { + docs: { + files: ['misc/demo/index.html'], + tasks: ['after-test'] + }, html: { files: ['template/**/*.html'], tasks: ['html2js', 'karma:watch:run'] @@ -165,7 +170,7 @@ module.exports = function(grunt) { options: { dest: 'dist/docs', scripts: [ - 'angular.js', + 'angular.js', '<%= concat.dist_tpls.dest %>' ], styles: [ @@ -182,7 +187,7 @@ module.exports = function(grunt) { } }); - //register before and after test tasks so we've don't have to change cli + //register before and after test tasks so we've don't have to change cli //options on the goole's CI server grunt.registerTask('before-test', ['enforce', 'jshint', 'html2js']); grunt.registerTask('after-test', ['build', 'copy']); diff --git a/misc/demo/assets/demo.css b/misc/demo/assets/demo.css index 8a3ee5c909..52f786cb23 100644 --- a/misc/demo/assets/demo.css +++ b/misc/demo/assets/demo.css @@ -86,16 +86,39 @@ section { line-height: 1; } -.icon-github { - background: no-repeat url('github-16px.png'); - width: 16px; - height: 16px; -} -/* Not enough room on mobile for markup tab, js tab, and plunk btn. +/* Not enough room on mobile for markup tab, js tab, and plunk btn. And no one cares about plunk button on a phone anyway */ @media only screen and (max-device-width: 480px) { #plunk-btn { display: none; } +} + +.navbar-nav .dropdown .navbar-brand { + max-width: 100%; + margin-right: inherit; + margin-left: inherit; +} + +.header-placeholder { + height: 175px; +} + +@media screen and (min-width: 768px) { + + .dropdown.open > .navbar-brand + .dropdown-menu { + left: 10px; + } + + .header-placeholder { + height: 50px; + } + + .navbar-nav .dropdown .navbar-brand { + max-width: 200px; + margin-right: 5px; + margin-left: 10px; + } + } \ No newline at end of file diff --git a/misc/demo/index.html b/misc/demo/index.html index 89b3fa0e59..6833d01ab3 100644 --- a/misc/demo/index.html +++ b/misc/demo/index.html @@ -10,51 +10,49 @@ - + + + -
-
- - UI Bootstrap - - - -
-
-
-
+
-

@@ -116,15 +114,13 @@

-
- -
-
-

Getting started

-
-
-
+
+
+
+

Getting started

+
+

Dependencies

This repository contains a set of native AngularJS directives based on @@ -166,47 +162,48 @@

CSS

- - <% demoModules.forEach(function(module) { %> -
-
-

<%= module.displayName %> - (ui.bootstrap.<%= module.name %>) -

-
-
-
- <%= module.docs.html %> -
-
- <%= module.docs.md %> -
-
-
-
-
-
- -
- - -
- 
<%- module.docs.html %>
+ <% demoModules.forEach(function(module) { %> +
+
+
+

<%= module.displayName %> + (ui.bootstrap.<%= module.name %>) +

+
+
+
+ <%= module.docs.html %>
- - -
- 
<%- module.docs.js %>
+
+ <%= module.docs.md %>
- - -
-
-
- - <% }); %> -
-
+
+
+
+
+
+ +
+ + +
+ 
<%- module.docs.html %>
+
+ + +
+ 
<%- module.docs.js %>
+
+ + +
+
+
+
+ + <% }); %> +
+