Skip to content
This repository has been archived by the owner on Oct 5, 2020. It is now read-only.

small ui fixes for 3 column theme #343

Merged
merged 5 commits into from
May 25, 2016
Merged

small ui fixes for 3 column theme #343

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58c7663
Merge pull request #1 from marklogic/master
janmichaelyu Dec 11, 2015
e83b8b7
Merge branch 'master' of https://github.com/marklogic/slush-marklogic…
janmichaelyu Jan 26, 2016
847569c
Merge branch 'ui-themes' of https://github.com/marklogic/slush-marklo…
janmichaelyu May 24, 2016
b9df4f9
fixed:
janmichaelyu May 25, 2016
0bf1f8d
fixed: change <p>&nbsp;</p> to use margin-bottom
janmichaelyu May 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/templates/ui/app/detail/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
<pre ng-if="ctrl.type!=='json'" class="pre-xml">{{ctrl.xml}}</pre>

<a ng-if="ctrl.type==='binary'" target="_blank" ng-href="/v1/documents?uri={{ctrl.uri}}&transform=download" class="btn btn-default">Download</a>

<p>&nbsp;</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we fix this with CSS instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to CSS implementation

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will look at this shortly

</div>
</uib-tab>
<uib-tab ng-if="ctrl.type!=='json'">
<uib-tab-heading>JSON</uib-tab-heading>
<div class="col-sm-9">
<json-explorer data="ctrl.json"></json-explorer>
<p>&nbsp;</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we fix this with CSS instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to CSS implementation

</div>
</uib-tab>
<uib-tab ng-if="ctrl.type==='json'">
Expand Down
32 changes: 28 additions & 4 deletions app/themes/3column/ui/styles/theme.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ i {
margin-top: 6px;
border: 1px solid #ddd;
}

.tab-content {
border: none;
}
Expand Down Expand Up @@ -506,6 +506,13 @@ form[name=profileForm] {
padding: 0 0 0 5px;
}

.border-radius(@radius){
.border-top-radius(@radius);
.border-right-radius(@radius);
.border-bottom-radius(@radius);
.border-left-radius(@radius);
}

.search {
.facet {
background-color: #fff;
Expand All @@ -519,16 +526,31 @@ form[name=profileForm] {
.col-md-9 {
background: #fff;
border: 1px solid #ddd;
margin: 0 0 20px;
}
}

.panel-group .panel {
border-radius: 0;
.row {
[class*='col-'] {
.border-radius(4px);
}
[class*='facet'] {
.border-radius(4px);
}
}

.panel {
.border-radius(4px);
}

//removing so that file icon panel shows rounded corners
// .panel-group .panel {
// border-radius: 0;
// }

.top-nav.pull-right {
margin: 15px 95px;

.btn {
margin-right: 20px;
}
Expand All @@ -537,3 +559,5 @@ form[name=profileForm] {
.navbar .user {
color: #d43f3a;
}