Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
84 app/assets/stylesheets/avatars_for_rails.css
@@ -0,0 +1,84 @@
+/*
+*= require jquery.Jcrop
+*= require jquery.fileupload-ui
+*/
+
+/******************** Common ***********************/
+
+#avatars_for_rails img { max-width: none !important; }
+.clearfloat { clear: both; height: 0px;}
+
+/******************** Avatars ***********************/
+.avatars { padding-left: 10px; }
+.avatar { float:left; position:relative;}
+.avatar .actions { }
+.avatar .delete_avatar {
+ position:absolute;
+ top:5px;
+ right:5px;
+ display:none;
+}
+.avatar .default {
+ border: 5px solid #2A3890;
+}
+.avatar .non_default {
+ border: 5px solid #E0EEF5;
+}
+#avatar_logo_drag{
+ margin-left: 25px;
+}
+/******************** New form ***********************/
+.new_logo_form {
+}
+/******************** Slide Effect ***********************/
+.boxgrid {
+ width: 104px;
+ height: 104px;
+ float:left;
+ overflow: hidden;
+ position: relative;
+}
+.boxgrid img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ border: 0;
+}
+.boxcaption {
+ top: 104px;
+ left: 5px;
+ float: left;
+ position: absolute;
+ background: #E0EEF5;
+ opacity: .8;
+ width: 84px;
+ height: 28px;
+ /* For IE 5-7 */
+ filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+ /* For IE 8 */
+ -MS-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+}
+.captionfull .boxcaption {
+ top: 104px;
+ left: 5px;
+ padding: 5px;
+}
+/**************** Crop **************/
+#precropDiv {
+ width:499px;
+ display:inline-block;
+ padding: 0px 30px 0px 29px;
+}
+#precropPrev {
+ vertical-align:top;
+ display:inline-block;
+ /*padding: 5px 4px 5px 4px;*/
+}
+#precropPrevImg {
+ width:100px;
+ height:100px;
+ overflow:hidden;
+ margin-left:30px;
+ border: 1px solid #E0EEF5;
+}
+
View
55 app/assets/stylesheets/bootstrap.css
@@ -42,7 +42,6 @@ a:focus {
a:hover,
a:active {
outline: 0;
-
}
sub,
sup {
@@ -69,65 +68,63 @@ button,
input,
select,
textarea {
-margin: 0;
-font-size: 100%;
-vertical-align: middle;
+ margin: 0;
+ font-size: 100%;
+ vertical-align: middle;
}
button,
input {
-*overflow: visible;
-line-height: normal;
+ *overflow: visible;
+ line-height: normal;
}
button::-moz-focus-inner,
input::-moz-focus-inner {
-padding: 0;
-border: 0;
+ padding: 0;
+ border: 0;
}
button,
input[type="button"],
input[type="reset"],
input[type="submit"] {
-cursor: pointer;
--webkit-appearance: button;
+ cursor: pointer;
+ -webkit-appearance: button;
}
input[type="search"] {
--webkit-appearance: textfield;
--webkit-box-sizing: content-box;
--moz-box-sizing: content-box;
-box-sizing: content-box;
+ -webkit-appearance: textfield;
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
}
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-cancel-button {
--webkit-appearance: none;
+ -webkit-appearance: none;
}
textarea {
-overflow: auto;
-vertical-align: top;
+ overflow: auto;
+ vertical-align: top;
}
.clearfix {
*zoom: 1;
}
.clearfix:before,
.clearfix:after {
-display: table;
-content: "";
+ display: table;
+ content: "";
}
.clearfix:after {
-clear: both;
+ clear: both;
}
.hide-text {
-overflow: hidden;
-text-indent: 100%;
-white-space: nowrap;
+ overflow: hidden;
+ text-indent: 100%;
+ white-space: nowrap;
}
.input-block-level {
-display: block;
-width: 100%;
-min-height: 28px;
-/* Make inputs at least the height of their button counterpart */
-
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
View
2  app/views/common_documents/_home.html.erb
@@ -6,7 +6,7 @@
<li class="span2">
<div class="caption elipsis">
<h4 class="link_gray size16"><%= link_to truncate_name(document.title, :length => 20), document %></h4>
- <h5><span class="green"><%=t('follow.followers')%>:</span> <span class="ligth-gray"><%=35%></span> views</h5>
+ <h5></span> <span class="green"><%=35%></span> views</h5>
</div>
</li>
</ul>
View
13 app/views/common_documents/_profile.html.erb
@@ -0,0 +1,13 @@
+<%= div_for document, :class => 'row' do %>
+ <ul class="thumbnails span2">
+ <li class="span">
+ <%= link_to "", document, :class => icon_class_for(document), :alt => document.title %>
+ </li>
+ <li class="span_profile">
+ <div class="caption elipsis">
+ <h4 class="link_gray"><%= link_to truncate_name(document.title, :length => 15), document, :class => "size14" %></h4>
+ <h5></span> <span class="green"><%=35%></span> views</h5>
+ </div>
+ </li>
+ </ul>
+<% end %>

No commit comments for this range

Something went wrong with that request. Please try again.