Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:uvalib/libra-oa

  • Loading branch information...
commit 6b58736c8f50349d10bbed6e6569082b60c52a1d 2 parents 73738f3 + 0a0f77f
darthmolly authored
View
2  app/views/catalog/_edit_partials/_release.html.erb
@@ -40,5 +40,5 @@
<%= delete_asset_link(params[:id], label) %>
</div>
<% else %>
- <p class="released-notice">This object has been released for circulation and may be modified but not deleted. For assistance with deleting this object, please contact the <%= link_to "administrators", feedback_path %>.</a>
+ <p class="released-notice notice">This object has been released for circulation and may be modified but not deleted. For assistance with deleting this object, please contact the <%= link_to "administrators", feedback_path %>.</a>
<% end %>
View
6 public/stylesheets/uva/libra.css
@@ -675,8 +675,8 @@ h1.elsewhere-heading {padding-left: 12px;}
* http://twitter.github.com/bootstrap/
-------------------------------------------------------------- */
- .btn { cursor: pointer; display: inline-block; background-color: #e6e6e6; background-repeat: no-repeat; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); padding: 5px 14px 6px; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); color: #333; font-size: 13px; line-height: normal; border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-transition: 0.1s linear all; -moz-transition: 0.1s linear all; transition: 0.1s linear all; }
-.btn:hover { background-position: 0 -15px; color: #333; text-decoration: none; }
+ .btn, .addval.textfield { cursor: pointer; display: inline-block; background-color: #e6e6e6; background-repeat: no-repeat; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); font-style: normal; padding: 5px 14px 6px; text-decoration: none; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); color: #333; font-size: 13px; line-height: normal; border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-transition: 0.1s linear all; -moz-transition: 0.1s linear all; transition: 0.1s linear all; }
+.btn:hover, .addval.textfield:hover { background-position: 0 -15px; color: #333; text-decoration: none; }
.btn.primary { color: #fff5f2; background-color: #225992; background-repeat: repeat-x;
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0));
@@ -686,7 +686,7 @@ h1.elsewhere-heading {padding-left: 12px;}
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3269a2', endColorstr='#225992', GradientType=0);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); }
-.btn:active { -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); }
+.btn:active, .addval.textfield:active { -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); }
.btn.disabled { cursor: default; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=65); -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
.btn[disabled] { cursor: default; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: alpha(opacity=65); -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
.btn.large { font-size: 16px; line-height: normal; padding: 9px 14px 9px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; }
View
10 public/stylesheets/uva/styles.css
@@ -974,7 +974,7 @@ div#delete_dialog div.button {
display: inline;
margin-bottom: 10px;
margin-top: 10px; }
-.released-notice { color: #555;}
+.notice.released-notice { color: #555; width: 70%; }
#cover_container ul { margin-top: 5px }
div.release_notice {
background: #fff;
@@ -1347,7 +1347,6 @@ table#file_assets tr th { background: #EFEFEF;}
.document_date { width: 100px }
.document_files { width: 30px }
.edit-browse {
- position: absolute;
-webkit-border-radius: 6px 6px 6px 6px;
-moz-border-radius: 6px 6px 6px 6px;
border-radius: 6px 6px 6px 6px;
@@ -1356,12 +1355,13 @@ table#file_assets tr th { background: #EFEFEF;}
box-shadow: 0 0 4px #D8DBDF;
-webkit-background-clip: padding-box; }
.edit-browse.edit-browse-top {
- right: 4px;
+ position: absolute;
+ right: -170px;
top: 28px;
}
.edit-browse.edit-browse-bottom {
- right: 4px;
- bottom: 52px;
+ float: right;
+ margin: 1.5em 0;
}
.show.edit-browse.edit-browse-top,
.show.edit-browse.edit-browse-bottom {
Please sign in to comment.
Something went wrong with that request. Please try again.