[Git][noosfero/noosfero][master] 2 commits: Adjustments in responsive theme
Rodrigo Souto
gitlab at mg.gitlab.com
Mon Jun 25 19:06:23 BRT 2018
Rodrigo Souto pushed to branch master at Noosfero / noosfero
Commits:
412aceeb by Iasmin Mendes at 2018-06-25T22:06:19Z
Adjustments in responsive theme
- - - - -
503438a2 by Rodrigo Souto at 2018-06-25T22:06:19Z
Merge branch 'theme-adjustments' into 'master'
Adjustments in responsive theme
See merge request noosfero/noosfero!1507
- - - - -
8 changed files:
- app/views/blocks/_profile_big_image.html.erb
- features/article_versioning.feature
- features/secret_community.feature
- features/send_email_to_environment_members.feature
- plugins/piwik/lib/piwik_plugin.rb
- plugins/social_statistics/lib/social_statistics_plugin.rb
- public/designs/themes/base/style.scss
- public/stylesheets/profile.scss
Changes:
=====================================
app/views/blocks/_profile_big_image.html.erb
=====================================
@@ -27,6 +27,18 @@
</div>
<% end %>
</div>
+<% else %>
+ <div class='profile-image'>
+
+ <%=
+ if theme_option(:profile_list_bg_imgs)
+ link_to image_tag(profile_pic profile), profile.url
+ else
+ link_to profile_image(profile, :big) +"\n", profile.url
+ end
+ %>
+ </div>
+
<% end %>
<%= javascript_include_tag 'cropped_image' %>
=====================================
features/article_versioning.feature
=====================================
@@ -68,7 +68,7 @@ Feature: article versioning
@selenium
Scenario: try to access versions of unexistent article
Given I go to /joaosilva/unexistent-article/versions
- Then I should see "There Is No Such Page:"
+ Then I should see "There is no such page:"
@selenium
Scenario: deny access to versions when disabled on article
@@ -76,7 +76,7 @@ Feature: article versioning
| owner | name | body | display_versions |
| joaosilva | Versions disabled | Versions can't be displayed | false |
And I go to /joaosilva/versions-disabled/versions
- Then I should see "Access Denied"
+ Then I should see "Access denied"
@selenium
Scenario: deny access to specific version when disabled on article and not logged
@@ -85,7 +85,7 @@ Feature: article versioning
| false |
And I am not logged in
And I go to /joaosilva/edited-article?version=1
- Then I should see "Access Denied"
+ Then I should see "Access denied"
@selenium
Scenario: deny access to specific version when disabled, private and not logged
@@ -94,4 +94,4 @@ Feature: article versioning
| false | false | false |
And I am not logged in
And I go to /joaosilva/edited-article?version=1
- Then I should see "Access Denied"
+ Then I should see "Access denied"
=====================================
features/secret_community.feature
=====================================
@@ -35,7 +35,8 @@ Feature: Use a secret community
Scenario: Non members shouldn't see secret communit's content
Given I am logged in as "maria"
And I go to mycommunity's homepage
- And I should see "Oops ... You Cannot Go Ahead Here This profile is inaccessible. You don't have the permission to view the content here. Go back Go to the home page Manual This social network uses Noosfero, developed by Colivre and licensed under the GNU Affero General Public License version 3 or any later version."
+ And I should see "Oops ... you cannot go ahead here"
+ And I should see "This profile is inaccessible. You don't have the permission to view the content here."
And I go to /search/communities
Then I should not see "My Community"
=====================================
features/send_email_to_environment_members.feature
=====================================
@@ -15,7 +15,7 @@ Feature: send emails to environment members users
| ultraje |
And I am logged in as "ultraje"
When I go to /admin/users/send_mail
- Then I should see "Access Denied"
+ Then I should see "Access denied"
@selenium
Scenario: Send e-mail to members
=====================================
plugins/piwik/lib/piwik_plugin.rb
=====================================
@@ -35,7 +35,7 @@ class PiwikPlugin < Noosfero::Plugin
proc do
protocol = request.ssl? ? 'https' : 'http'
link = "#{protocol}://#{domain}/#{path}?idSite=#{id_site}"
- {:title => _('Piwik'), :icon => 'line-chart', :url => link,
+ {:title => _('Piwik'), :icon => 'chart-line', :url => link,
:html_options => {:target => '_blank'}}
end
end
=====================================
plugins/social_statistics/lib/social_statistics_plugin.rb
=====================================
@@ -16,7 +16,7 @@ class SocialStatisticsPlugin < Noosfero::Plugin
if user.is_admin?
proc do
{ :title => _('Stats'),
- :icon => 'pie-chart',
+ :icon => 'chart-pie',
:url => '/stats',
:html_options =>
{ :title => _("Manage the environment statistics."),
=====================================
public/designs/themes/base/style.scss
=====================================
@@ -273,6 +273,8 @@ body, th, td, input {
margin-top: 38px;
right: 0px;
max-height: 400px;
+ @media only screen and (max-width:319px) { right: -40px; }
+
form {
width: 320px;
@media only screen and (max-width: 540px) { width: 260px; }
@@ -504,7 +506,6 @@ body, th, td, input {
font-weight: 500;
margin-top: 10px;
text-align: left;
- text-transform: capitalize;
padding-bottom: 5px;
}
@@ -596,7 +597,6 @@ div#notice {
#content .block-title {
font-size: 18px;
- text-transform: capitalize;
text-align: left;
border-bottom: 2px solid #212e3c;
padding-bottom: 2px;
@@ -1133,6 +1133,7 @@ div#notice {
.portal-news-item {
display: flex;
+ align-items: center;
.post-date {
flex: 1;
@@ -1167,6 +1168,17 @@ div#notice {
}
}
+#portal-news li.portal-news-item .order-options {
+ display: flex;
+ flex-direction: column;
+ text-align: right;
+ margin-left: 5px;
+
+ a:not(:last-child) {
+ margin-right: 0;
+ }
+}
+
/* ==> search-results.css <== */
=====================================
public/stylesheets/profile.scss
=====================================
@@ -45,6 +45,11 @@
overflow-x: hidden;
}
+.controller-environment_design #content > .button-bar {
+ margin-right: 5%;
+ text-align: right;
+}
+
#circles-checkboxes {
text-align: left;
margin-left: 15%;
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/c260d44105f16b1dec79010ccb4bde9cf858032f...503438a27e3b98918607b3486eb849ea5234b09b
--
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/c260d44105f16b1dec79010ccb4bde9cf858032f...503438a27e3b98918607b3486eb849ea5234b09b
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180625/9405db80/attachment-0001.html>
More information about the Noosfero-dev
mailing list