#59 new template
Merged 6 years ago by bex. Opened 6 years ago by ryanlerch.
fedora-docs/ ryanlerch/docs-fp-o master  into  master

file modified
+4 -3
@@ -220,11 +220,12 @@ 

  

  .nav-header ul {

    font-size: 14px;

+   padding-left:1em;

  }

  

  .nav-header ul li a {

    display: block;

-   padding: 5px 20px 5px 25px;

+   padding: 3px 0px 4px 7px;

    font-size: 13px;

    font-weight: normal;

  }
@@ -235,8 +236,8 @@ 

    width: 14px;

  }

  

- .nav-sidebar li a {

-   color: inherit;

+ .docs-sidebar li a {

+   color: #555;

  }

  

  .nav-sidebar li a:hover {

@@ -1,6 +1,6 @@ 

  <%- navigation.each do |topic_group| -%>

    <%- if topic_id.start_with?(topic_group[:id]) %>

-     <li class="hidden-xs active">

+     <li class="breadcrumb-item hidden-xs active">

        <%- if topic_group.has_key?(:topics) -%>

          <a href="<%= subtopic_shim %><%= topic_group[:path] %>"><%= topic_group[:name] %></a>

        <%- else -%>

file modified
+2 -2
@@ -2,11 +2,11 @@ 

    <%- if not topic_group.has_key?(:topics) -%>

        <li><a class="<%= topic_id.start_with?(topic_group[:id]) ? ' active' : '' %>" href="<%= subtopic_shim %><%= topic_group[:path] %>"><%= topic_group[:name] %></a></li>

    <%- else -%>

-     <li class="nav-header">

+     <li class="nav-header list-unstyled">

        <a class="" href="#" data-toggle="collapse" data-target="#topicGroup-<%= topic_group[:id].hash %>">

          <span id="sgSpan-<%= topic_group[:id].hash %>" class="fa <%= topic_id.start_with?(topic_group[:id]) ? 'fa-caret-down' : 'fa-caret-right' %>"></span>&nbsp;<%= topic_group[:name] %>

        </a>

-     <ul id="topicGroup-<%= topic_group[:id].hash %>" class="collapse <%= topic_id.start_with?(topic_group[:id]) ? 'in' : '' %> list-unstyled">

+     <ul id="topicGroup-<%= topic_group[:id].hash %>" class="collapse <%= topic_id.start_with?(topic_group[:id]) ? 'show' : '' %> list-unstyled">

        <%= render("_templates/_nav.html.erb", :navigation => topic_group[:topics], :topic_id => topic_id, :subtopic_shim => subtopic_shim) %>

      </ul>

      </li>

no initial comment

rebased onto e674fa3

6 years ago

Pull-Request has been merged by bex

6 years ago