This repository has been archived by the owner on Sep 8, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 194
Fix for #93 #149
Open
groberts9
wants to merge
3
commits into
angular-ui:master
Choose a base branch
from
groberts9:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix for #93 #149
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <!DOCTYPE html> | ||
| <html ng-app="x"> | ||
| <head lang="en"> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width"> | ||
|
|
||
| <title>Same as demo 2 but has larger buttons for testing using touch</title> | ||
|
|
||
| <!-- Le css --> | ||
| <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> | ||
| <link rel="stylesheet" type="text/css" href="../src/ui-layout.css"/> | ||
|
|
||
| <!-- Le javascript --> | ||
| <script type="application/javascript" src="../bower_components/jquery/dist/jquery.js"></script> | ||
| <script type="application/javascript" src="../bower_components/angular/angular.js"></script> | ||
| <script type="application/javascript" src="../src/ui-layout.js"></script> | ||
| <script type="application/javascript"> | ||
|
|
||
| var app = angular.module('x', ['ui.layout']); | ||
| app.controller('DemoController', function($scope) { | ||
| $scope.config = { | ||
| flow: 'column' | ||
| } | ||
| }); | ||
|
|
||
| </script> | ||
| <style> | ||
| .red { | ||
| background-color: red; | ||
| } | ||
| .green { | ||
| background-color: green; | ||
| } | ||
| .ui-splitbar { | ||
| background-color: red; | ||
| } | ||
| .ui-layout-container { | ||
| display: inline-block; | ||
| } | ||
| a { | ||
| padding: 10px; | ||
| background-color: green; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body ng-controller="DemoController"> | ||
| <div ui-layout="config" options="{ dividerSize : '30' }"> | ||
| <div ui-layout-container max-size="50%"> | ||
| One | ||
| <br/> | ||
| <button ng-click="updateDisplay()">Update Display</button> | ||
| </div> | ||
| <div ui-layout-container collapsed="false">Two</div> | ||
| <div ui-layout-container> | ||
| <!--Three--> | ||
| <div ui-layout="{ flow:'row', dividerSize:'32' }"> | ||
| <div ui-layout-container>Three</div> | ||
| <div ui-layout-container> | ||
| <div ng-include="demo/testinclude.html"></div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div ui-layout-container> | ||
| Four | ||
| </div> | ||
| </div> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <!DOCTYPE html> | ||
| <html ng-app="x"> | ||
| <head lang="en"> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width"> | ||
|
|
||
| <title>Same as demo 2 but has larger buttons for testing using touch</title> | ||
|
|
||
| <!-- Le css --> | ||
| <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> | ||
| <link rel="stylesheet" type="text/css" href="../src/ui-layout.css"/> | ||
|
|
||
| <!-- Le javascript --> | ||
| <script type="application/javascript" src="../bower_components/angular/angular.js"></script> | ||
| <script type="application/javascript" src="../src/ui-layout.js"></script> | ||
| <script type="application/javascript"> | ||
|
|
||
| var app = angular.module('x', ['ui.layout']); | ||
| app.controller('DemoController', function($scope) { | ||
| $scope.config = { | ||
| flow: 'column' | ||
| } | ||
| }); | ||
|
|
||
| </script> | ||
| <style> | ||
| .red { | ||
| background-color: red; | ||
| } | ||
| .green { | ||
| background-color: green; | ||
| } | ||
| .ui-splitbar { | ||
| background-color: red; | ||
| } | ||
| .ui-layout-container { | ||
| display: inline-block; | ||
| } | ||
| a { | ||
| padding: 10px; | ||
| background-color: green; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body ng-controller="DemoController"> | ||
| <div ui-layout="config" options="{ dividerSize : '30' }"> | ||
| <div ui-layout-container max-size="50%"> | ||
| One | ||
| <br/> | ||
| <button ng-click="updateDisplay()">Update Display</button> | ||
| </div> | ||
| <div ui-layout-container collapsed="false">Two</div> | ||
| <div ui-layout-container> | ||
| <!--Three--> | ||
| <div ui-layout="{ flow:'row', dividerSize:'32' }"> | ||
| <div ui-layout-container>Three</div> | ||
| <div ui-layout-container> | ||
| <div ng-include="demo/testinclude.html"></div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div ui-layout-container> | ||
| Four | ||
| </div> | ||
| </div> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reenable tests, please