Skip to content

Commit

Permalink
Merge pull request #6386 from jxtx/ui-flex
Browse files Browse the repository at this point in the history
Some style cleanup.
  • Loading branch information
dannon committed Jun 24, 2018
2 parents 31e7846 + f16da19 commit fbb032f
Show file tree
Hide file tree
Showing 23 changed files with 1,309 additions and 1,382 deletions.
49 changes: 49 additions & 0 deletions client/galaxy/docs/galaxy-buttons.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
## Buttons

```
<button>Just a default button</button>
```

```
<a href="#" class="action-button">An anchor with .action-button</a>
```

All the crazy permutations of menu button...

```
<a href="#" class="menubutton">An anchor with .menu-button</a>
```

```
<a href="#" class="menubutton popup">An anchor with .menu-button.popup</a>
```

```
<a href="#" class="menubutton popup split">
<a class="menubutton-label">An anchor with .menu-button.popup.split</a>
</a>
```

## Radio Buttons

As generated by mvc.ui.ui-options

```
<div class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-secondary active">
<input type="radio" name="options" id="option1" autocomplete="off" checked> Active
</label>
<label class="btn btn-secondary">
<input type="radio" name="options" id="option2" autocomplete="off"> Radio
</label>
<label class="btn btn-secondary">
<input type="radio" name="options" id="option3" autocomplete="off"> Radio
</label>
</div>
```

## Pagination

```
<ul class="pagination"><li class="page-item disabled"><a class="page-link" href="#page/1"><span class="fa fa-angle-double-left"></span></a></li><li class="page-item disabled"><a class="page-link" href="#page/1">0</a></li><li class="page-item active"><a class="page-link" href="#page/1">1</a></li><li class="page-item"><a class="page-link" href="#page/2">2</a></li><li class="page-item"><a class="page-link" href="#page/4"><span class="fa fa-angle-double-right"></span></a></li></ul>
```
55 changes: 55 additions & 0 deletions client/galaxy/docs/galaxy-forms.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
## Forms

Manually crafted "tool" form class, this is broken in the BS4 branch I think.

```
<div class="tool-form">
<form name="foo">
<div class="form-row">
<label>Label Input 1</label>
<input id="input1" type="text" name="input1" size="40" />
</div>
<div class="form-row">
<input type="submit" id="send" name="submit" value="submit" />
</div>
</form>
</div>
```

Portlet variant generated by mvc.form.form-view

```
<div class="ui-portlet-limited" id="uid-8">
<div class="portlet-header">
<div class="portlet-operations"></div>
<div class="portlet-title">
<i class="portlet-title-icon fa fa-unlock-alt" style="display: inline;"></i>
<span class="portlet-title-text">Portlet Title</span></div>
</div>
<div class="portlet-content">
<div class="portlet-body">
<div class="ui-message alert alert-info"></div>
<div>
<div class="ui-form-element section-row">
<div class="ui-form-error ui-error"><span class="fa fa-arrow-down"></span><span class="ui-form-error-text"></span></div>
<div class="ui-form-title">
<div class="ui-form-collapsible" style="display: none;">
<i class="ui-form-collapsible-icon"></i>
<span class="ui-form-collapsible-text"></span>
</div>
<span class="ui-form-title-text">Text Field 1</span>
</div>
<div class="ui-form-field">
<input class="ui-input" id="field-uid-4" type="text">
<span class="ui-form-info"></span>
<div class="ui-form-backdrop" style="display: none;"></div>
</div>
<div class="ui-form-preview" style="display: none;"></div>
</div>
<div class="ui-form-element section-row">
<div class="ui-form-error ui-error" style="display: none;"><span class="fa fa-arrow-down"></span><span class="ui-form-error-text"></span></div>
<div class="ui-form-title"><div class="ui-form-collapsible" style="display: none;"><i class="ui-form-collapsible-icon"></i><span class="ui-form-collapsible-text"></span></div><span class="ui-form-title-text" style="display: inline;">Password</span></div>
<div class="ui-form-field">
<input class="ui-input" type="password"><span class="ui-form-info"></span><div class="ui-form-backdrop" style="display: none;"></div></div><div class="ui-form-preview" style="display: none;"></div></div>
<div class="ui-form-element section-row" id="uid-7" style="display: none;"><div class="ui-form-error ui-error" style="display: none;"><span class="fa fa-arrow-down"></span><span class="ui-form-error-text"></span></div><div class="ui-form-title"><div class="ui-form-collapsible" style="display: none;"><i class="ui-form-collapsible-icon"></i><span class="ui-form-collapsible-text"></span></div><span class="ui-form-title-text" style="display: inline;">token</span></div><div class="ui-form-field"><div id="field-uid-7"><div style="display: none;"></div><div></div></div><span class="ui-form-info"></span><div class="ui-form-backdrop" style="display: none;"></div></div><div class="ui-form-preview" style="display: none;"></div></div></div></div><div class="portlet-buttons"><button type="button" class="ui-button-default btn btn-primary ui-clear-float" id="submit" data-original-title="" title=""><i class="icon fa fa-save ui-margin-right"></i><span class="title">Submit</span><div class="progress" style="display: none;"><div class="progress-bar" style="width: 0%;"></div></div></button></div></div><div class="portlet-backdrop"></div></div>
```
69 changes: 69 additions & 0 deletions client/galaxy/docs/galaxy-masthead.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
## Masthead

As generated by layout.masthead.js

Default height:

```
<nav id="masthead" class="navbar navbar-expand justify-content-center navbar-dark bg-dark">
<a class="navbar-brand">
<img class="navbar-brand-image"/>
<span class="navbar-brand-title">Title</span>
</a>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link">Header 1</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle">Header 2</a>
</li>
<li class="nav-item active">
<a class="nav-link">Active Header</a>
</li>
</ul>
</nav>
```

Override height with "height: 80px;"

```
<nav id="masthead" class="navbar navbar-expand justify-content-center navbar-dark bg-dark" style="height: 80px;">
<a class="navbar-brand">
<img class="navbar-brand-image"/>
<span class="navbar-brand-title">Title</span>
</a>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link">Header 1</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle">Header 2</a>
</li>
<li class="nav-item active">
<a class="nav-link">Active Header</a>
</li>
</ul>
</nav>
```

Override height with "height: 4rem;"

```
<nav id="masthead" class="navbar navbar-expand justify-content-center navbar-dark bg-dark" style="height: 4rem;">
<a class="navbar-brand">
<img class="navbar-brand-image"/>
<span class="navbar-brand-title">Title</span>
</a>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link">Header 1</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle">Header 2</a>
</li>
<li class="nav-item active">
<a class="nav-link">Active Header</a>
</li>
</ul>
</nav>
```
19 changes: 19 additions & 0 deletions client/galaxy/docs/galaxy-menus.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Popup menus

These are the classes for the menu itself, normally floating, so placed inside
a relative element.

```
<div style="position: relative; height: 12rem;">
<div class="popmenu-wrapper" style="top: 0;">
<ul class="dropdown-menu">
<li class="head"><a>Heading one</a></li>
<li><a>An item</a></li>
<li><a>Another item</a></li>
<li class="head"><a>Heading two</a></li>
<li><a>Third item</a></li>
<li><a>Last item</a></li>
</ul>
</div>
</div>
```
33 changes: 33 additions & 0 deletions client/galaxy/docs/galaxy-messages.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
### Panel Messages

Messages that appear across the top of the panel view below the masthead.

```
<div>
<div v-for="type in ['done', 'info', 'warning', 'error']">
<div v-bind:class="'panel-' + type + '-message'">I'm a panel-{{type}}-message</div>
</div>
</div>
```

### Large Messages

Used for providing feedback inline.

```
<div>
<div v-for="type in ['done', 'info', 'warning', 'error']">
<div v-bind:class="type + 'messagelarge'">I'm a {{type}}messagelarge</div>
</div>
</div>
```

### Small Messages

```
<div>
<div v-for="type in ['done', 'info', 'warning', 'error']">
<div v-bind:class="type + 'message'">I'm a {{type}}message</div>
</div>
</div>
```
20 changes: 20 additions & 0 deletions client/galaxy/docs/galaxy-panels.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## Panel (toolMenuContainer)

```
<div style="height: 200px;">
<div style="position: absolute; width: 250px; height: 200px; border: dotted gray 1px">
<div class="unified-panel-header">
<div class="unified-panel-header-inner">
Header
</div>
</div>
<div class="unified-panel-body">
<div class="toolMenuContainer">
one<br>
two<br>
three<br>
</div>
</div>
</div>
</div>
```

0 comments on commit fbb032f

Please sign in to comment.