nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DG MS; changed the gear on top nav to not be a tab

Browse source
This commit is contained in:
Daniel Vincent Grippi 2010-09-08 12:34:08 -07:00
parent 5fd105c1dc
commit f7dd0b10b9
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/user.rb
View file

@ -255,8 +255,7 @@ class User
end end
def terse_url def terse_url
terse= self.url.gsub(/https?:\/\//, '') terse = self.url.gsub(/(https?:|www\.)\/\//, '')
terse.gsub!(/www\./, '')
terse = terse.chop! if terse[-1, 1] == '/' terse = terse.chop! if terse[-1, 1] == '/'
terse terse
end end

5
app/views/shared/_group_nav.haml
View file

@ -9,9 +9,8 @@
%li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button") %li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button")
%li #group_edit_button
%span{:class => '⚙'} = link_to "edit", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
= link_to "⚙", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
.yo{ :style => "display:none;"} .yo{ :style => "display:none;"}
#add_group_pane #add_group_pane

7
public/stylesheets/application.css
View file

@ -448,7 +448,14 @@ h1.big_text {
display: none; } display: none; }
#group_nav { #group_nav {
position: relative;
color: black; } color: black; }
#group_nav #group_edit_button {
display: inline;
margin-top: 1px;
font-size: 12px; }
#group_nav #group_edit_button a {
color: #999999; }
#group_nav ul { #group_nav ul {
margin-bottom: 0; margin-bottom: 0;
padding: 0; padding: 0;

13
public/stylesheets/sass/application.sass
View file

@ -567,7 +567,19 @@ h1.big_text
:display none :display none
#group_nav #group_nav
:position relative
:color #000 :color #000
#group_edit_button
:display inline
:margin
:top 1px
:font
:size 12px
a
:color #999
ul ul
:margin :margin
:bottom 0 :bottom 0
@ -602,6 +614,7 @@ h1.big_text
a a
:color #999 :color #999
.selected .selected
:font :font