#1 Fix sidebar text and stylesheet
Closed 6 years ago by bex. Opened 6 years ago by bex.
Unknown source bex_sidebar  into  master

file modified
+2 -1
@@ -88,6 +88,7 @@

  .navbar-brand {

    padding: initial;

    height: initial;

+   padding: 12px;

  }

  

  .nav > li  > a.hover{
@@ -372,7 +373,7 @@

  .exampleblock > .content h1, .exampleblock > .content h2, .exampleblock > .content h3, .exampleblock > .content #toctitle, .sidebarblock.exampleblock > .content > .title, .exampleblock > .content h4, .exampleblock > .content h5, .exampleblock > .content h6 { line-height: 1; margin-bottom: 0.625em; }

  .exampleblock > .content h1.subheader, .exampleblock > .content h2.subheader, .exampleblock > .content h3.subheader, .exampleblock > .content .subheader#toctitle, .sidebarblock.exampleblock > .content > .subheader.title, .exampleblock > .content h4.subheader, .exampleblock > .content h5.subheader, .exampleblock > .content h6.subheader { line-height: 1.4; }

  .exampleblock.result > .content { -webkit-box-shadow: 0 1px 8px #e3e3dd; box-shadow: 0 1px 8px #e3e3dd; }

- .sidebarblock { border-style: solid; border-width: 1px; border-color: #e3e3dd; margin-top: -1.0em; margin-bottom: 1.6em; padding: .5em; background: #F1F3F5; -webkit-border-radius: 4px; border-radius: 4px; overflow-x: auto; }

+ .sidebarblock { border-style: solid; border-width: 1px; border-color: #e3e3dd; margin-top: -1.0em; margin-bottom: 1.6em; margin-left: 1em; padding: .5em; background: #F1F3F5; -webkit-border-radius: 4px; border-radius: 4px; overflow-x: auto; float: right; width: 40%; }

  .sidebarblock > :first-child { margin-top: 0; }

  .sidebarblock > :last-child { margin-bottom: 0; }

  .sidebarblock h1, .sidebarblock h2, .sidebarblock h3, .sidebarblock #toctitle, .sidebarblock > .content > .title, .sidebarblock h4, .sidebarblock h5, .sidebarblock h6, .sidebarblock p { color: #333333; }

file modified
+8 -19
@@ -49,25 +49,14 @@

  ****

  Consensus decision-making aims to be:

  

- *'''Agreement Seeking:''' A consensus decision-making process attempts to help everyone get what they need.

- *'''Collaborative:''' Participants contribute to a shared proposal and shape it into a decision that meets the concerns of all group members as much as possible.

- *'''Cooperative:''' Participants in an effective consensus process should strive to reach the best possible decision for the group and all of its members, rather than competing for personal preferences.

- *'''Egalitarian:''' All members of a consensus decision-making body should be afforded, as much as possible, equal input into the process. All members have the opportunity to present, and amend  proposals.

- *'''Inclusive:''' As many [[wiktionary:stakeholder|stakeholders]] as possible should be involved in the consensus decision-making process.

- *'''Participatory:''' The consensus process should actively solicit the input and participation of all decision-makers

- 

- — from [https://en.wikipedia.org/wiki/Consensus_decision-making#Objectives Wikipedia on Consensus decision-making]

- 

- }}

- Many basic decisions are made through a process known as "'''lazy approval'''", in which general consent is assumed unless valid objections are raised within a period of time — generally three to seven days, although the timeframe should be stated each time and should be proportionate to the impact of the action.  This process is used for decisions with short-term consequences and which can be easily reversed. Any project member can ask for the deadline to be extended or the decision escalated to require full consensus.

- 

- More significant decisions are made through a process of '''full consensus'''. In order to pass, these decisions need three positive votes (+3) and ''no'' negative votes (-1). A negative vote immediately halts the process and requires discussion. Therefore, in order to remain valid, negative votes must be supported with a specific concerns about the poposal, and suggestions for what could be changed in order to make the proposal acceptable. A vote of "0" is sometimes used to indicate a disagreement but willingness to stand aside; this should also be accompanied with an explanation.

- 

- This model matches Fedora's "Friends" foundation, which calls for finding acceptable consensus to serve the interests of advancing free software. It works because we work together in a community of mutual respect even when we disagree.

- 

- In general, the Council conducts business in public discussion, and any Fedora project member can make negative or positive votes. It is the duty of the Council to take concerns raised in this way into serious consideration, but only Council members' votes are binding in the final tally.

- 

- When consensus can't be reached, the Council may ask the Fedora Project Leader to decide on a resolution. Such a request can be made when issues leading to negative votes are outstanding and all Council members agree that the Council is deadlocked, or if the dispute is unresolved after fourteen days and a simple majority of Council members are in favor of the request.

+ * **Agreement Seeking:** A consensus decision-making process attempts to help everyone get what they need.

+ * **Collaborative:** Participants contribute to a shared proposal and shape it into a decision that meets the concerns of all group members as much as possible.

+ * **Cooperative:** Participants in an effective consensus process should strive to reach the best possible decision for the group and all of its members, rather than competing for personal preferences.

+ * **Egalitarian:** All members of a consensus decision-making body should be afforded, as much as possible, equal input into the process. All members have the opportunity to present, and amend  proposals.

+ * **Inclusive:** As many link:http://en.wiktionary.org/wiki/stakeholder[stakeholders] as possible should be involved in the consensus decision-making process.

+ * **Participatory:** The consensus process should actively solicit the input and participation of all decision-makers

+ 

+ — from link:https://en.wikipedia.org/wiki/Consensus_decision-making#Objectives[Wikipedia on Consensus decision-making]

  ****

  

  Many basic decisions are made through a process known as "*lazy

Fixes sidebar formatting and eliminates duplicate text. @mattdm please verify.

Pull-Request has been closed by bex

6 years ago