glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed topic card css

Browse source
This commit is contained in:
Shai Mor 2014-08-12 12:56:13 -04:00
parent 65c8cb2ea7
commit f8e6be70e1
2 changed files with 7 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/metamaps/Metamaps.js
View file

@ -691,6 +691,9 @@ Metamaps.TopicCard = {
setTimeout(function () { setTimeout(function () {
var text = $(element).val(); var text = $(element).val();
if (event.type=="paste" || (event.type=="keyup" && event.which==13)){ if (event.type=="paste" || (event.type=="keyup" && event.which==13)){
if (text.slice(0, 4) !== 'http') {
text='http://'+text;
}
topic.save({ topic.save({
link: text link: text
}); });

58
app/assets/stylesheets/base.css
View file

@ -9,11 +9,10 @@
.showcard { .showcard {
position:absolute; position:absolute;
display:none; display:none;
top:300px; top:100px;
left:100px; left:100px;
margin-top: -181px;
width:300px; width:300px;
height:360px; min-height:360px;
color:#FFF; color:#FFF;
text-align: left; text-align: left;
overflow: visible; overflow: visible;
@ -48,28 +47,11 @@
height:100%; height:100%;
color:#000; color:#000;
z-index: 25; z-index: 25;
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
display: -ms-flexbox; /* TWEENER - IE 10 */
display: -webkit-flex; /* NEW - Chrome */
display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */
-webkit-box-orient: vertical;
-moz-box-orient: vertical;
-webkit-box-direction: normal;
-moz-box-direction: normal;
-ms-flex-direction: column;
-webkit-flex-direction: column;
flex-direction: column;
} }
.CardOnGraph .scroll { .CardOnGraph .scroll {
display:block; display:block;
padding:5px 0 0 10px; padding:5px 0 10px 10px;
-webkit-box-flex: 1; /* OLD - iOS 6-, Safari 3.1-6 */
-moz-box-flex: 1; /* OLD - Firefox 19- */
-webkit-flex: 1; /* Chrome */
-ms-flex: 1; /* IE 10 */
flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */
} }
.CardOnGraph .type { .CardOnGraph .type {
@ -89,11 +71,6 @@
padding:5px; padding:5px;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
-webkit-box-flex: none; /* OLD - iOS 6-, Safari 3.1-6 */
-moz-box-flex: none; /* OLD - Firefox 19- */
-webkit-flex: none; /* Chrome */
-ms-flex: none; /* IE 10 */
flex: none; /* NEW, Spec - Opera 12.1, Firefox 20+ */
} }
.best_in_place_name { .best_in_place_name {
@ -157,11 +134,6 @@ font-family: 'LatoLight';
position:relative; position:relative;
border-bottom: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA;
border-top: 1px solid #AAAAAA; border-top: 1px solid #AAAAAA;
-webkit-box-flex: none; /* OLD - iOS 6-, Safari 3.1-6 */
-moz-box-flex: none; /* OLD - Firefox 19- */
-webkit-flex: none; /* Chrome */
-ms-flex: none; /* IE 10 */
flex: none; /* NEW, Spec - Opera 12.1, Firefox 20+ */
} }
.linkItem { .linkItem {
@ -359,34 +331,12 @@ float:left;
.CardOnGraph .attachments { .CardOnGraph .attachments {
-webkit-box-flex: 1; /* OLD - iOS 6-, Safari 3.1-6 */
-moz-box-flex: 1; /* OLD - Firefox 19- */
-webkit-flex: 1; /* Chrome */
-ms-flex: 1; /* IE 10 */
flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
display: -ms-flexbox; /* TWEENER - IE 10 */
display: -webkit-flex; /* NEW - Chrome */
display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */
-webkit-box-orient: horizontal;
-moz-box-orient: horizontal;
-webkit-box-direction: normal;
-moz-box-direction: normal;
-ms-flex-direction: row;
-webkit-flex-direction: row;
flex-direction: row;
border-top: 1px solid #AAAAAA; border-top: 1px solid #AAAAAA;
width:100%; width:100%;
max-height:48px; height:48px;
} }
.attachments a { .attachments a {
-webkit-box-flex: 1; /* OLD - iOS 6-, Safari 3.1-6 */
-moz-box-flex: 1; /* OLD - Firefox 19- */
-webkit-flex: 1; /* Chrome */
-ms-flex: 1; /* IE 10 */
flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;